Merge "Fix an issue for work profiles (or any profile with a shared UI)." into main