Merge "Test aspect ratio restrictions not applied to resizeable activities in desktop" into main