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

Change-Id: Icee06050d8000ada0ed7973a7befb90a1273238b