Merge changes from topic "361454352-adaptiveIcon" into main

* changes:
  Make RippleDrawable as the only background drawable to be borderless
  Enforce the gridview vertical spacing to be >= 0