Merge "Updated popup dialog 9 patches (light)" into honeycomb-mr2