Merge "Test fixed rotation config changes" into pi-dev