Merge "Update screen edge insets size"