Merge "Postponing registering widget listener" into sc-dev