Merge "move isShown to PollingCheck" into jb-dev