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

Change-Id: Ibf7ae797ee8f4ca739347c5b1143f080a1b86d5c