Merge "Revert workaround for missing frame callback" into ub-launcher3-edmonton