Merge "Ensure that we timeout waiting when starting the PiP menu activity" into oc-dr1-dev