Merge changes I4ad08873,If0562677,I5fe6ba32 into jb-mr1-dev

* changes:
  Don't auto-discover peers until scan requested.
  Use wfdInfo to filter available sinks.
  Allow adb shell am display-size to use bigger sizes.