Merge "Keep scrim black when "always on" is off" into pi-dev