Merge "Fix crash caused when clicking on list menu item" into mnc-dev