Merge "Made expanded bubble "Manage" button update on theme change." into main