Merge "Change BOOLEAN_TILE to TOGGLEABLE_TILE"