Merge "Fix memory leak in setActionProvider() - support edition" into lmp-mr1-ub-dev