Merge "fix screen on/off animation, which was flipped"