Merge "Add unit tests for LockSettingsStrongAuth" into rvc-dev