Merge "Fix leak for MenuInflater + setSupportActionBar" into lmp-mr1-ub-dev