Merge changes Ic8254f0f,I1f285c3b

* changes:
  Ignore justified in layoutlib for the moment
  Update Canvas_Delegate after Change I3edc963a