Merge "Fix issue with resizing background and incorrectly outline." into oc-mr1-dev