Merge "Revert "Enable remote animation for keyguard going away transition."" into sc-dev