Merge "Fix bounds clipping to be based on app bounds" into main