Merge "Better power savings with wifi display code." into jb-mr1-dev