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

Change-Id: I4274a14b7410183a6073cc0e806258f0173cd959