Merge "Tweak layouts for digital clock widget." into jb-mr1.1-dev