Merge "Optionally add app launch icons to a nav bar "shelf""