Merge "Adding test protocol support for getting num all apps columns" into main