Merge "Hide Camera in CryptKeeperConfirm" into klp-dev