Merge "Bug 5513073 - IllegalArgumentException: View not attached to window manager" into ics-mr1