Merge "Add "Uploaded patch set 1" message for the UI changes" into stable-2.11