[automerger skipped] Merge "Force FGS notifications to show for a minimum time" into qt-dev am: e590a7d0b5
am: 9ec959b8f3 -s ours
am skip reason: change_id I0680034ed9315aa2c05282524d48faaed066ebd0 with SHA1 09843a687b is in history

Change-Id: I8cb6a74fb003c359cf81f5dbf84d77f675dd5b5c