Merge "Change selection strategy for ACTION_DISMISS_TIMER"