Merge "Resolve activity bounds with transformed display info" into rvc-dev am: d071b2526e am: a328d02862 am: 797530f060 am: 233f16b550

Change-Id: I1a6c052b50b79f9ed30a2df38af6ca149bb20498