Merge "Update user consent dialog for device log access" into tm-dev