Merge "Improved user callbacks on SystemService:" into rvc-dev