Merge "Adjust LongScreenshotActivity padding based upon system insets" into main