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

Change-Id: Id817ff647231869eec2745baa954fd6f633ee2eb