Merge "Expand emergency button to match size of container when only item in separated list." into qt-dev