Merge "Set menu item to MATCH_PARENT for tap target" into sc-dev