Applied Craig's Stream naming patch
Began support for tablet UI disabling (refs #213)