Merge "[Bouncer] Add min margin bottom for window inset." into tm-dev