Apply bug 843802 - use manifest app type property.