Merge "Clean up Tile related classes in settingslib."