Merge "Ensure closeSystemDialogs() is not oneway."