Merge "Account for content insets in source rect hint for transition into PiP" into oc-dev