Merge "Remove cursor when edit text no longer has focus" into sc-dev