Merge "Fix issue with non-focusable PiP activities being resumed." into oc-dev