data-binding: refactoring and explanatory comment about initial state sync
Merge branch '2.4'