Merge "Don't check whether dismiss() is called on the UI thread Bug #6436642" into jb-dev