Changes according to the review.
Merge branch 'feature/55287534/asynchronous-chrome-storage' into develop