Merge "Add activity opt-out property for universal resizable" into main