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

Change-Id: If6c10b70709435451c05d0345d38e4a032826184