Merge "Adds null check before applyPostResolutionFilter"