Merge commit 'fbe21943e0cfa093318fb856824a143b03b97a72' * commit 'fbe21943e0cfa093318fb856824a143b03b97a72': Fix for 2137900: Be more conservative about poking the wakelock