Merge "More lockscreen tuning" into ub-camera-glacier