Merge "Fix owl boot loop" into pi-dev