Merge "Revert "Add system bottom inset to drawer layout"" into main