Merge "Image state restoration for LongScreenshotActivity" into sc-dev