Merge changes I5d907c33,Ibce48cd2 into cw-f-dev

* changes:
  In SurfaceFlinger, test fence before merging
  libui: Change hasSignaled to return optional<bool>