Support beacon polish fixes.

Fixes #5455, and adds a clock overlay which shows the remaining delay:

![beacons](https://cloud.githubusercontent.com/assets/167819/3138449/00a527ee-e88f-11e3-8f7d-7638eb4a9169.png)