Merge "EditText - can not drag handles in extracted mode" into mnc-dev