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