Merge "Remove the @hide annotation for the dynamic index of Settings Search."