Merge "Removing per-user PiP component."