Merge "Fixed the problem where mini-month ignoring taps"