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

Change-Id: Id2c2fb5b3af00a900830cc2415ec71e014e52e00