Merge "Allow brightnessSensor to be nullable"