Merge "Comment more on component callback order for N+ OS"