Fixed offset jumps on content inset changes + cleanup.