Merge "InsetsState isn't needed when drawing snapshot with aspect ratio match" into main