Merge "Modernize Lockscreen Clocks flag" into main