Update on battery drain. Looking at the battery stats the Android OS usage seems to have returned to normal and hovers around 8%, while Android System uses 18%. However the battery is still draining faster than I think it should.
According to GSam, since last full charge:
Screen 30 hours of...