Merge "Improve swiping to reveal gear for ongoing notifications with time check" into nyc-mr1-dev