am 6b0653ff: am bfdecccc: Merge "Only scan for wifi display when there is no active connections" into klp-dev

* commit '6b0653ffadea757c87724594b70922cd11dcd835':
  Only scan for wifi display when there is no active connections