Merge "Don't do anti-falsing on locked shade" into nyc-dev