Merge changes I51f77d9e,I46e84695 into main

* changes:
  Fix the computation of default crops to match legacy
  Get rid of the field WallpaperData.mSupportsMultCrop