Merge changes I2581fd7c,I1ed57e6d into main

* changes:
  fs_mgr: Refactor by inlining trivial helpers
  fs_mgr_overlayfs: Make all string constants constexpr