Merge "Extend screen capture disabled test" into mnc-dev