Merge "Mock views in Keyguard view tests" into rvc-dev