Merge "Fix notification shade inefficient contrast" into qt-dev am: f185b652bd
am: c6f2a4f41f

Change-Id: Ie1bc40ce6cd6c26d7d9c308e7054e02d87104e25