Merge "Add Settings Slice Whitelist key" into pi-dev