am a1415360: am 2021956a: am ab45a217: Make wake-and-unlock faster

* commit 'a1415360d739a382bde8efa2fdb9cce4a1e8c00e':
  Make wake-and-unlock faster