am 21f72d39: Cherry-pick: cc: Update draw if external draw constraints change

* commit '21f72d39fdcd06983f7460f2c2e82d9287549915':
  Cherry-pick: cc: Update draw if external draw constraints change