Merge "Resolve activity bounds with transformed display info" into rvc-dev