Merge "Update font/color of user consent dialog for device log access" into tm-dev