Should fix #1261 and show an error if consolidating files fails.
Fix #1264. ‘Always Hide Controls’ menu item correctly reflects state now.