Revert "Framework: Forward port Expanded desktop capability"

This reverts commit eed21ae2b1258f25fde3b57690c63f9431e71a8c.