Merge "Disabled DEBUG_USER constant on SystemService." into rvc-dev