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

Change-Id: I0ad21e140aa10566f58acfa01fb7e4172edca0d3