Merge "Add rotation logs to help debug bug reports" into pi-dev