am e597d5f9: Merge "Use rotation to position circular display mask" into klp-modular-dev

* commit 'e597d5f9310f760843272c728d6fb1917abf241a':
  Use rotation to position circular display mask