Merge "Fix issue with PiP callbacks not being handled" am: bdd8adb006 am: 4e11a71210
am: 3b38be2962

Change-Id: Iecad54744e7491279f886305a03050be98d5c8a4