Merge "Fix an issue which causes back key doesn't work"