Merge "Fix for bug: 7274232. Bold date on lock screen." into jb-mr1-dev