Merge "Update battery usage app list filter logic:"