Merge "Wait on activity brought to front for trampoline activities." into oc-dev