Merge "vidc: handle secure and non-secure session concurrency"