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

Change-Id: I6d781ee6e3fcb76ddcb206b88334234f5f0e52af