Merge "Replace clearAll with withoutDefaultCapabilities" into sc-dev