Merge "Fixed an issue where the keyguard statusbar was faded" into qt-r1-dev
am: a474d66a62

Change-Id: Id2b1577bb78795fc5f86755b6466c6ccfe2dd935