Merge "Ensure that we timeout waiting when starting the PiP menu activity" into oc-dr1-dev am: e3184764 am: 7fb48a77 Change-Id: Ic95cc72ccd03e2bb11b417331a0994f06000c9ac