More changes for Unlocked.
Merge branch 'master' of https://github.com/almalence/OpenCamera.git