Merge "Revert "[DO NOT MERGE] Turn off FOLDER_NAME_SUGGEST feature flag"" into qt-qpr1-dev am: fe04158ce4

Change-Id: I8458d09d0d593ff83a4bf5dfbdd6f229a21dceff