am 8f40a25d: am 5fcfa576: am bb09a7cd: am bc687f96: Merge "Drag handles persist after lost focus in extracted mode" into mnc-dev

* commit '8f40a25de70bdb6878a5622fce2818039c4fdfbb':
  Drag handles persist after lost focus in extracted mode