Merge changes I0ccbdb5a,I0f5d57e5 into sc-dev

* changes:
  Use surface size instead of frame size when adjusting layer bounds
  Fix SurfaceView background layer leaks