Merge commit '5b02ecf87cd8e6e11ffd84ff200767f3ebfd66d9' into HEAD

* commit '5b02ecf87cd8e6e11ffd84ff200767f3ebfd66d9':
  Fix SmartReply/SmartForward in EAS 2.5
Fix merge with 42e3f10a9575e277ba6f121e6cac56ddb02fda12