Merge "Fixed another case where the systemUI could crashloop" into nyc-dev