Merge "Fix ToolbarActionBar invalidating destroyed Activities" into mnc-ub-dev