Merge "If home activity is not fullscreen keep drilling." into klp-dev