Merge "ApexManager: Request apexservice only when needed" into rvc-dev