am 892609ad: am aeffc9ce: Merge "Always draw the circular emulator overlay with square dimensions" into lmp-mr1-modular-dev

* commit '892609ad34145e6418e42c683428f1a880b4c874':
  Always draw the circular emulator overlay with square dimensions