Merge "Frameworks/base: Make profile buffer adjustable" into nyc-dev