Merge "Fix jank while unlocking and security is set" into lmp-dev