Merge "Ensure rotate disable2 flag can be set on boot" into pi-dev