Merge "Separating quota window for pre-S apps" into sc-dev