Merge changes I4c34111a,I62aa1748 into main

* changes:
  [1/n] Don't apply aspect ratio restrictions for resizeable activities in desktop mode
  [0/n] Bug fix flag for ignoring aspect ratio when freeform resizeable