Merge "Make sure 9patches are not filtered when not necessary Bug #5383406"