Merge "Enable audio streaming to a wifi display. Remove startup delay hack." into jb-mr1-dev