Merge "CompositionEngine: base inverse transform on primary display" into rvc-dev am: 2f116e22b0

Change-Id: Id34d6662da8ff87513cc0b534e21c5b72346b11a