Merge "Add volatile qualifier to boolean variable" into nyc-dev