separate enforceContainerWithinScreen logic to a private method am: 27790352a3

Change-Id: I965c403341a9bca872a0d14c455e25aa254cf41e