Merge "Disable snap targets that make apps <220dp" into nyc-dev