Merge "b/3008692 Stops callback from running after activity finished. Do not merge" into gingerbread