Merge "Set correct flag when enabling listener for conditions." into nyc-mr1-dev