Merge "fix [3408713] Dialog window invisible sometimes" into honeycomb