cherry-pick error 'Add battery level around unlock ring' fix