Merge "Mark apexd session as successful before marking staged session applied"