Merge "Fix regression in PiP app-ops listener."