Merge "Fix back key display issue in the split-screen"