Merge "Refactoring deferred bind logic" into ub-launcher3-master