Merge "Fix issue #5128639: SystemUI grows by 10MB after taking a screenshot"