Merge "Switch to ViewTunnel to handle phone ui"