Make "stay awake" also work for wireless charging

Resolves CYAN-4636.

Change-Id: I089610b8cea16bf48d044c9e9615c750608e0b90
Merge branch into kk_mkt