Improve appearance of Edit workflow on 2.3

Bug: 67135
Change-Id: Id270c712f7424cb120b15fbcc8a893378258f317