Merge "Fix for reveal animated drawables"