Merge "Fix b/265632782: Battery usage app list changed when entering the app details page and back"