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

Change-Id: Ia348fefba31573d5dee51742f591507807ab7c66