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

Change-Id: I0e8ded855237ac5e03f0cb80e0dc47d28480ff70