Merge "Fix a systemui crash." into tm-dev