Don't set shelf height if we are in landscape. am: e50d7a2f54 am: f75d7c958f

Change-Id: I245ddd026168f8d2fd7ee8bde6a7242d1e864a43