Merge "Remove add slippery flag to nav bar when connected to launcher service"