Merge "Ensure that animation does not play after brief lapses in app usage" into sc-dev