Merge "Fix edge to edge issue on Blocked Numbers edit screen." into main