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

Change-Id: I918a3ea442c077872285b76b67beb0b169fbad0d