Merge "Fixed NPE for HoneycombDelegate"