Merge "Update PiP dismiss target on theme change" into sc-v2-dev