Merge "Finish incoming/outgoing/exchange layouts" into honeycomb