Merge "Implement camera affordance" into master-lockscreen-dev