Merge "Added safeguards for pushed brighntess curve." into pi-dev