Merge "Fix the bug that queries UsageStatsService for locked users" into rvc-dev