Merge "Don't set shelf height if we are in landscape. am: e50d7a2f54 am: f75d7c958f am: a9c0bbee04" into rvc-qpr-dev-plus-aosp am: 1a3c88062f

Change-Id: I87f22cac5c6ec8c285196b7dfa3cf643c1890d2b