am ac90bf18: Merge "Addressing slow rotation due to folders (issue 5297213)"

* commit 'ac90bf1883e608ec3256b1263ec9d2cdc9216a04':
  Addressing slow rotation due to folders (issue 5297213)