am aeffc9ce: Merge "Always draw the circular emulator overlay with square...
am aeffc9ce: Merge "Always draw the circular emulator overlay with square dimensions" into lmp-mr1-modular-dev
* commit 'aeffc9ce':
Always draw the circular emulator overlay with square dimensions