Merge "Hopefully fix issue #20297662: Statusbar clock not updating"