Merge "Fix singleInstance usage when singleTop intended" into lmp-dev