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

Change-Id: Ibecec36d296ab0b56ff62527725d35ed1c72e5c4