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

Change-Id: I1e1aff4cc6ebbe8c7ef8d262cd377bfae320e51d