Merge "Remove extra app info setting under specific condition" into sc-dev