* commit '583db6d3f6965fe1a3ca840d2024c18be3733792': Preserve surface insets when view layout is updated