Merge "Fix CollapsingToolbarAppCompatActivity didn't apply Edge To Edge correctly" into main