Merge "Update stylus battery notification string from "1% battery remaining" to "Stylus battery 1%"." into main