Merge "Fix uninstalled app issue on battery usage page" into main