Merge "[MQ] Clean up ambient light APIs" into main