Merge "Reduce unnecessary overhead of SystemUiContext" into sc-v2-dev