Toggle: optimized aria attribute setting
Merge pull request #4072 from patheard/optimize-toggle

Toggle: optimized aria attribute setting