Merge "Disconnect HTTP-based data source upon reset" into lmp-dev