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

Change-Id: Icd7a7bd08221d480b5e30b2a4165d90fb7b45619