Merge "Further work on issue #7307399: Framework needs a new pre-user-shutdown..." into jb-mr1-dev