Merge "Add terminal app to stoppable_fgs_system_apps" into main