Merge "Bump min SDK level" into main