Merge "DO NOT MERGE: Revert "Force FGS notifications to show for a minimum time"" into qt-qpr1-dev