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

Change-Id: I88d04ee8a92d14d73cea35bedcac76441c58ce07