Merge "Fix the unresposible close button." into ics-mr1