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

Change-Id: I8c3cc563a622385ee93859c28f82e8664f12b54e