Merge "Fixing wrong window insets estimation" into tm-dev