Merge "Move attach/detach PiP menu calls to onTaskAppear/Vanish."