Merge "In editor, use Up button instead of Save button" into lmp-mr1-dev