Merge "Not calling updateCallback in constructor as it can cause initialization error" into main