Merge "Fix the misleading issue for battery saver notification" into main