Merge "Add extra logging for changing CLIR settings."