Merge "Hide the collapse/expand icon if text fits the screen" into mnc-dev