Merge "[Shadow] Fix failed test case for battery defender" into main