Merge changes I41ca2f92,Ib48746d8 into main

* changes:
  [2/n] Ignore Compat UI Education when in Desktop Mode
  [1/n] Flag creation for Desktop Windowing CompatUI logic