Merge pull request #8907 from JosJuice/android-overlay-stick-gate Android: Use octagonal stick gate in overlay
