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

Change-Id: I0f0737b4407b9af27bf2012643786c718832d273