bug 1080877 - Cleanup stylus, make home demo swapping work infinitely