Prevent SurfaceWidgets from focussing themselves

Bug: 63909
Change-Id: I45537ba813bc177667de75463e4e53e19378d3e3
Merge "Prevent SurfaceWidgets from focussing themselves"