Merge "Deprecate MENU_STATE_CLOSE for PiP menu" into sc-v2-dev