Merge "Handle screen capture disabled state for multiple users" into tm-dev