Merge "Deprecate use of onActivityHidden() in PiP" into main