am 8ec23033: Fix subtle folder jank related to previous change

* commit '8ec2303379eb467e063113385c9514063abed787':
  Fix subtle folder jank related to previous change