Merge "Change colors for a11y" into qt-dev am: fc868fa839
am: 8188626a47

Change-Id: Ic1bc9c6a35e59eec3a23cf55c0f1ff6a45dd5511