Merge "Define separate view styles outside of P2P dialog layout" into tm-dev