Merge "Updated UserIconDrawable#shouldUpdateColorFilter to return true if current ColorFilter was not an instance of PorterDuffColorFilter"