Merge "Better service management for QS 3rd party tiles"