Merge "Prevent flicker when typing any character for filter." into qt-qpr1-dev am: ba5d5af3c5
am: c8aed57e0c

Change-Id: I4eea53b4d789a7100814845140d2fd8a4849c5f9