Merge "Fix flashing wifi dialog after rotating back from landscape." into ics-mr1