Merge "Polish developer option enable verbose vendor logging"