Merge "Fix SHUTDOWN after SETUP and before PLAY in wifi display." into jb-mr2-dev