Merge "Update clock to use 14dp instead of 12dp for status info." into klp-dev