Merge "Fix radio button flash on hour change." into mnc-dr1.5-dev