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

Change-Id: Ida93e02bae4e099ae20d2db7bd0d3efb774a546c