Merge "Update quick settings wireless display tile per spec." into jb-mr1-dev