Merge \"Fixed another case where the systemUI could crashloop\" into nyc-dev
am: 02ab2f52bf

Change-Id: If26ae07e20433213334233bea1231440fae817e1