Merge "Differentiate between automatic and manual brightness in metrics." into pi-dev