Merge "Fix creating the UceController instance associated with the invalid subscription ID"