Merge "Fix a bug with enterTouchMode removing focus"