Merge "Fix memory leak in ToolbarActionBar" into lmp-mr1-ub-dev