Merge "Fix Cts tests for assist when showSession flags are 0" into sc-dev