am 40006309: Merge "Check for home activity when switching focus." into klp-dev

* commit '40006309990c40f5b4b26646b98df222d8d27922':
  Check for home activity when switching focus.