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