am b2f15652: Merge "More lockscreen tuning" into ub-camera-glacier

* commit 'b2f156527da437c1c4901c03bd004eb49eae23f6':
  More lockscreen tuning