Merge "Enlarge cmd buffer size of FrameworkListener"