Ensure back buttons are visible even when there is no caption (#13585)

Change-Id: I550facd67ffbe06360bdebb2173602f2842cdc9f