Merge "Fix onHandleAssist behaviour when showSession is called with flags = 0" into sc-dev