Modified assertCurrentActivity(), issue-416