Merge MatrixActivity from testing branch