Merge "Update wifi p2p to direct user to enable location" into qt-dev