Merge "Add a flag for extending class to skip loading preview for performance" into sc-dev