Merge "Rename CanUnlockWithActiveUnlockTest.kt" into main