Merge "Continue to load fully expanded editor on Intent.ACTION_EDIT"