Merge "Introduce a lock screen fadeout, adjust timings" into main