Merge "Make ActivityViews backing virtual display private" into rvc-dev