Merge "Fix screen off animation when in landscape"