Merge "Directory fragment refactoring. First attempt to to refactor fragments...
Merge "Directory fragment refactoring. First attempt to to refactor fragments handling, state and app lifecycle." into nyc-dev
am: f0febdcf
* commit 'f0febdcf':
Directory fragment refactoring. First attempt to to refactor fragments handling, state and app lifecycle.