Merge "Fix radio button flash on hour change."