Merge "Fix clock disappearing from locksscreen" into main