Merge "ColorDisplayService: Check for null content observer before unregistering" into qt-dev