Merge "Don't use screenshot if structure is disabled (2/2)" into mnc-dev