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