Merge "Frameworks: Fix system server profiling"