Merge "Add hidden extra for communicating whether D2D is available" into sc-dev