Merge "wifi-display: pass session info to wifi display settings" into klp-dev