Merge "Fixed a grey flash when swiping away the last notification" into nyc-mr1-dev