Merge "Merge "Fix flickering when swiping on fingerprint reader to show notifications." into qt-dev am: abf84f7c4d am: 487faa3c49" into qt-r1-dev-plus-aosp
am: 706ac6e901

Change-Id: Id884a4189d3cf54aa074f9742b7db67ca69e465d