Merge "Update some dimens for portrait edit state" into main