Merge "Move dismiss target from stack to subview"