Merge "Add setting to disable screenshot separately (1/2)" into mnc-dev