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

Change-Id: I11aafc252dc733ef01cafd510b3a602aea803804