Merge "Separating system and user-installed apps in PS container." into main