Framework: Forward port Expanded desktop capability