Fix crash when opening the editor and move buttons to ActionBar

Change-Id: Id079a1e88c06aee2d1ff2894bc516c4df8b43406
3 files changed