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

Change-Id: I049ebe2411eb295d0441c6b4ed5b8116e0dafcf9