Merge "Fix hardware home key behavior on wake-up" into cm-10.2