Merge "UX polish for lock screen preview (1/3)." into tm-qpr-dev