Revert "Revert "Battery status ring around lock handle options""

This reverts commit 220ef49d28bece0417c64a7bf21efca3a1a4d272.