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

            return;

            return;

        }

        }

        if (!displayContent.isReady() || !mPolicy.isScreenOn()) {

        if (!displayContent.isReady() || !mPolicy.isScreenOn() || !okToAnimate()) {

            // No need to freeze the screen before the display is ready, system is ready, or if

            // No need to freeze the screen before the display is ready,  if the screen is off,

            // the screen is off.

            // or we can't currently animate.

            return;

            return;

        }

        }