Merge "Fix cursor not blinking when view re-added to layout" into udc-dev