Merge "Fix KTF state in OccludingAppDeviceEntryInteractorTest." into main