Merge "[Activity embedding] Fix unexpected finished 2nd layer problem"