Merge "Fixing issue with PiP settings not showing apps for other profiles."