Merge "Decouple the insets from configuration" into 24D1-dev