Merge "Reduce the scope for expensive computation for checking hidden dir" into sc-dev