Merge "Fix unnecessary onApplyWindowInsets"