Merge "Don't freeze display if it isn't okay to animate." into oc-dr1-dev
am: 932bc6dffc

Change-Id: Ie9a892f3e343170043d9683ef233c6fabc22cf03