Merge "Don't reset the preferred activity just for the home intent" into main