Merge "Using the keyguard fading away duration for the scrim" into qt-r1-dev am: 85224a5834
am: 7e5643525d

Change-Id: I91a9854fdbadf853d31ad2c687062a0e91b060c1