Merge "Don't placeViews if screen is already full screen" into tm-dev