Merge "Wakeup display on taps before entering true AoD" into tm-qpr-dev