Merge "Do not show black header if there is no action."