Merge "Add another getMessages() api to Folder" into jb-ub-mail-ur10