Merge "Only use surface based touchable region for updating input window"