Merge "Avoid closing PopUpContainer immediately after view is clicked." into tm-dev