Merge "Fix NPE with display lists when view not attached" into honeycomb