Merge "Remove the second target for ConnectedApPreference"