Merge "Fix ShadowSecureSettings"