Merge "Mark force resize/non-resize changes as @Overridable" into sc-dev