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

Change-Id: I426c087888baeee4a61d13f099477166e60a137b