Merge "Do not override insets frame if not set" into tm-dev