Merge "Adjust SysUI for new insets"