Merge "Make notification not swipeable"