Merge "Removing TWO_NEXUS_LAUNCHER_ACTIVITY_WHILE_UNLOCKING" into main