Add debug bars to surface widgets

Change-Id: Ic0fff2e65c76562f986a6bc6f0a34f2d594d462b
Merge "Add debug bars to surface widgets"