Merge "Dump last n brightness short-term models" into main