Merge "Switch widgets away from android.text.format.Time"