Merge "Fix notification being slided over with the gear not showing" into...
Merge "Fix notification being slided over with the gear not showing" into nyc-mr1-dev am: 9a20c64d am: 25ffd0db
am: 8a1650cf
Change-Id: Icdb04204d7dcbd52dc1a30ed8b508bbeecc4d6b6