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

Change-Id: Iaf1558df689ba4ea033b081ba1c24b5d45d7e36c