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

Change-Id: I0bb047927f4f8c21a2311e52123ce1b64b9104ac