[automerger] Add additional call to onStop() to stablize PIP position. am: 626467130f

Change-Id: I7338f8978dcfd0ce3a313a8ea5c911e4362c146d