Merge "Fix incorrect app count displayed under special app access" into rvc-dev