Don't set shelf height if we are in landscape. am: e50d7a2f54 am: c3b0cf88d1 am: 2ab32eea3d

Change-Id: I48de1046adf4b5757d10a524f46b96cfb7e95ed3