Merge \\\"Settings: Better handling for disabled tiles\\\" into nyc-dev am: 27eadb6f am: a62da523 am: 739f8958 Change-Id: I943edc13cc7e7bec50eb28204cd005e9aa005972