Merge "Fix issue with PiP callbacks not being handled"
am: bdd8adb006

Change-Id: I03c0ef06309b1b7559a973e2823598031de3b182