Merge "Fixed the shadows on the lockscreen for bypass" into qt-r1-dev
am: 9693956247

Change-Id: Ief4f88d457efe0656010f5f381bb8d7e3f7cd230