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