Merge "Ensuring we wait until resume before binding all apps. " into ub-launcher3-burnaby