Merge "Move edit icon from header to action bar"