Merge "Fix crash of PictureInPictureDetailPreferenceController" into sc-v2-dev