Merge "Apply pending AppInfo on Activity override change" into sc-dev