Merge "Ensure SysUI gets VIS callback when session's over" into tm-qpr-dev