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

Change-Id: I3ca5e31a3571398d1eb00cf0c7f40d1bb007055f