Merge changes Icdd110ec,I94e2b88e

* changes:
  Put showing and hiding of the overlay on the UI thread
  Fix udfps_view.xml to refer to the correct package