Merge "Remove the ability to set a preferred setup activity." into mnc-dev