Merge "Fixed a flickering when expanding and the notifications updates" into...
Merge "Fixed a flickering when expanding and the notifications updates" into nyc-dev am: 4ad13b33 am: cf851a98
am: 7d9f2023
* commit '7d9f2023':
Fixed a flickering when expanding and the notifications updates
Change-Id: Ic47d51d2744c051be206e7fac90f618312501c2c