Merge "Revert "Check for NLS service intent filter when rebinding services"" into main