Don't set shelf height if we are in landscape. am: e50d7a2f54 am: c3b0cf88d1 am: 2ab32eea3d am: ebef324448

Change-Id: I227c7e6ca10fd8b9f448599b5f0202fb43d9969b