Merge "Ensure that we timeout waiting when starting the PiP menu activity" into oc-dr1-dev am: e3184764 am: 9d35a1ee Change-Id: I87f0758cccc701d9da5c9eb753105f407bb2e461