Merge "Merge "Hide empty state icon and button in landscape mode." into rvc-dev am: 5e8e9e5f am: b4f696f6" into rvc-d1-dev-plus-aosp