Merge "Adding settings for managing auto-enter picture-in-picture."