Merge "Pass displayId to onActivityRotation()" into rvc-dev