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

Change-Id: Ic1c8942b34343e9cd167722dd039e2874ff3b0d8