Merge "Fix ToolbarActionBar invalidating destroyed Activities"