Merge "Fix leak for MenuInflater + setActionBar" into mnc-dev