Merge "Fix small tile state issue"