Merge "Fix discard dialog showing when applying clock font" into main