Merge "Set shelf screenshot landscape size and window insets" into 24D1-dev