Merge "FP2-1321:[ST_2][Monkey] 'com.android.systemui' crash once." into fp2-dev-v2