Merge "Adjust stubs for new getDimmer conditions" into main