Bug 993162 - Make default indent size 2 spaces. r=jwalker
Bug 997996 - Make ToolbarComponent.dismissEditingMode use the cancel editing mode button. r=mcomella