am 0fc5f869: am e597d5f9: Merge "Use rotation to position circular display mask" into klp-modular-dev * commit '0fc5f869': Use rotation to position circular display mask