Merge "Keep bundle effects enabled for volume apply with unsupported devices" into main