Merge "Fixed initial mDisplayId on KeyEvent."