Merge "Sink device not displaying PIN when connect using WPS_KEYPAD option" into pi-dev