Merge "Merge "Fixed a flickering when expanding and the notifications updates"...
Merge "Merge "Fixed a flickering when expanding and the notifications updates" into nyc-dev am: 4ad13b33 am: 8c6d8a8d" into nyc-mr1-dev-plus-aosp
am: c199267c
* commit 'c199267c':
Change-Id: I3cccfbbb7dacdb8366aa477e18af26230c572efd