Merge "Ensure that FalsingManager is not active when phone unlocked." into rvc-dev