Merge "Add class flags to class to help GC scanning"