Merge "Only scan for wifi display when there is no active connections" into klp-dev