Merge "Fix issue with PiP callbacks not being handled"