Merge "AnimateKeyguardInDelay should use the animator duration scale" into sc-qpr1-dev