Merge "Fix out-of-screen item can take focus issue"