Merge "Whitelist always-on setting"