Merge "Fix SystemUI crash" into tm-dev