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

Change-Id: I1221fa190ca7409bfab021eb56b37df2c436dfe6