Merge "Don't run finish callback until we actually finish" into ub-launcher3-rvc-dev am: b4d75d2931

Change-Id: I0fbb4b375ba2d19d9b3de20f3a5c6e02768cdd82