Merge "Only update UI when bound"