Merge "Frameworks/base: Add more systrace points" into nyc-dev