Merge "Make bundle channel even more system reserved" into main