Merge "DO NOT MERGE: Revert "Force FGS notifications to show for a minimum time"" into qt-qpr1-dev
am: a05396b249

Change-Id: I1636c99fa7962cce2f78f9794224537011c1f3c0