Merge "Avoid using withEndAction()" into jb-ub-mail-ur9