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