Merge "Directory fragment refactoring. First attempt to to refactor fragments handling, state and app lifecycle." into nyc-dev