Merge "Hide Camera in CryptKeeper" into klp-dev