Merge "Fix SystemUI crash for work challenge" into nyc-dev