Also remove a bunch of unnecessary inset paddings since Scaffold handles it (cherry picked from commit f85cbb158257f61d70b79e230671e3fa252a32c5)
Also remove a bunch of unnecessary inset paddings since Scaffold handles it (cherry picked from commit f85cbb158257f61d70b79e230671e3fa252a32c5)