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

Change-Id: I993dd5584b929f97d067b0824744dbe90ca38cad