Merge changes from topic "edit_menu_v2" into rvc-dev am: 6f22413c6f am: f66604f909

Change-Id: I601f4854114bd9641d16e71e2d0b89564e918dc4