[MC] Make bundle alignment mode setting idempotent and support nested bundles