Merge "Revert "Specify max go intent for wifi display"" into jb-mr1-dev