Merge "Don't animate invisible views" into sc-dev