Merge "Improved APN setting logging" into tm-dev