Merge "Keep "Resetting your internet" when screen rotates" into tm-qpr-dev