am 2e561546: Merge "Floating toolbar shown after rotation in extract mode" into mnc-dev

* commit '2e5615467e40856e758631cea542da804de01a7d':
  Floating toolbar shown after rotation in extract mode