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

Change-Id: I3de394c9687e4322b4bfbd5b33c02e1a3b27cc44