Merge "Add support to configure double line clock in lockscreen [2/2]" into main