[automerger skipped] Merge "Force FGS notifications to show for a minimum time" into qt-qpr1-dev am: 4514a4e44b
am: 03a69951ed -s ours
am skip reason: change_id I0680034ed9315aa2c05282524d48faaed066ebd0 with SHA1 3ceaa9b957 is in history

Change-Id: I693c3a5700e06a9a9f14b84b79161806688d05cc