Merge "Use HwLight.type as the key of mLightsByType"