Merge "Set unlockAmount = 1f when keyguardGoingAway = false." into tm-qpr-dev