Merge "Resolve activity bounds with transformed display info" into rvc-dev am: d071b2526e am: 17a3dfb41c

Change-Id: I49b32901024acb47a04ba9df054168c731771a6a