Merge changes from topic 'am-866a059a-f7fc-4082-9b78-f35b177cf256' into ub-launcher3-master

* changes:
  separate enforceContainerWithinScreen logic to a private method am: 27790352a3 am: 6dc62fb2d4
  separate enforceContainerWithinScreen logic to a private method am: 27790352a3
  separate enforceContainerWithinScreen logic to a private method