Merge "Revert "Enable remote animation for keygaurd."" into sc-dev