Merge "Tweak DELAY_UI for 16Hz to 15Hz"