Merge "Bug 16147163: Secure camera can now be launched with FUL running" into lmp-dev