Merge "Removing 2nd background clock font display from statusbar and lock screen" into ics-mr1