Merge \"Settings: Better handling for disabled tiles\" into nyc-dev
am: 27eadb6f1d

Change-Id: I6fd319a6bce9748db40ffc53849c68e2e8da5ad5