Merge "Adding test to ensure consistent PiP callbacks." into oc-dev