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

Change-Id: Ida03be8a9b513204077e3c277d146b8ccff876ef