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

Change-Id: Id70dab5ec07d17a8e88205c157f25ff352c5bcb6