Merge "Using the keyguard fading away duration for the scrim" into qt-r1-dev