Merge "Fix SideLoadedAppListenerTest" into rvc-qpr-dev