Merge "New fragment stuff: back stack, and layout integration."