Merge "Crash in com.android.systemui.tests, java.lang.IllegalStateException" into sc-dev