Merge changes from topic "remove_surface_size"

* changes:
  SF: User buffer size instead of layer size when calculating size
  SF: User buffer size to compute crop, set geometry and update cursor pos