Merge "Fix switching clock in picker not take effects on lockscreen" into main