Merge "Support disableIfNoEncryptionCapabilities attribute" into sc-dev