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

Change-Id: I53daa52f81189b188f5d10490e758b0a563c1525