Merge "Pop up soft keyboard when rename dialog shows" into sc-dev