Merge "Add null check when determining mOnTopOfHome" into klp-dev