Merge "Add scaled resizing non-resizable app scenario" into main