Merge "Fixed a grey flash when swiping away the last notification" into nyc-mr1-dev am: d9a569ae58 am: f58948fc04
am: 5344778f13

Change-Id: Ib77373bb69319fa4fc735f01e358c32f5d6d833a