Merge "Make wifi display state changes more robust." into jb-mr1-dev