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

Change-Id: Ia160497ca078e4d7c2ed99b28d41713cc17f5c90