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

Change-Id: I4043149dab7227bb151f3459505e6c7532c9f311