Merge "Provide a debugging option to force enable wifi display." into jb-mr1-dev