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

Change-Id: I29cba386e8599f27b482dcffe69a5f39ea1df46c