Merge "HWC2: Add properties to revert latching changes" into nyc-mr1-dev