Merge "Make system server profiling an explicit runtime intent" into pi-dev