Merge "Fix bug with clock when keyguard widgets disabled"