Merge "Fix GridFragment crash in landscape" into tm-dev