Merge "Disable auto correct/suggest on folder edit text am: 9b98d13022 am: 30357d8f89" into rvc-qpr-dev-plus-aosp