Merge "Add Developer option to enable vendor logging in Settings app"