Merge "Drag handles persist after lost focus in extracted mode" into mnc-dev