Merge "Ignore Wakelock Under-Locked Exception" into klp-dev