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

* commit '8990cb5768efba46bb1d7458377dd44498afcfdb':
  Fix flashing wifi dialog after rotating back from landscape.