Merge "Remove DisplayList.java"