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

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