Tweak ContextMenu animations to more closely match the built-in experience
Merge branch 'custom'
Merge branch 'modular'