Merge "Fix when typing text and the grab handle is visible/pressed." into devel/master