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