Merge "Populate error message if apexd.markStagedSessionReady fails"