Merge "Fix bug where home presses were not poking user activity." into gingerbread