Merge "Fix runInstrumentableFragmentCodeInspection test case fail" into sc-dev