Merge "Set application info flags prior to scanning" into pi-dev