Merge "Merge "Stop animation when screen times out and the user turns on the phone." into sc-dev am: a16f9cc2 am: 2a237b74" into sc-v2-dev-plus-aosp