Merge "Add visual stability manager to data-layer"