Merge "Dialog not dismissed when tearing down dialog fragment." into jb-dev