Merge "Fixed battery percentage not animating when showing/hiding"