We have a fix for this in the After Effects CC 2015 (13.6) update:
http://adobe.ly/1MVxHgX
Try it out and let us know how it works for you.
---------------------------------------------------------------------------------------------------------
Todd Kopriva, Adobe Systems Incorporated
After Effects product manager and curmudgeon
After Effects team blog
---------------------------------------------------------------------------------------------------------