Merge "Stop animation when screen times out and the user turns on the phone." into sc-dev