Merge "Adds additional UiEvent logs for LongScreenshotActivity" into sc-qpr1-dev