Merge "Fix global screen rotation issue."