Merge "Force FGS notifications to show for a minimum time" into qt-dev