Merge "fix screen on/off animation (again)"