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

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