Merge "Fixing test due to null PiP default bounds." into oc-dev