Merge "Override app bounds related configuration fields for legacy app" into 24D1-dev