Merge "Increase default Wm buffer size"