Merge "Implement "Revert auto-sizing" menu option." into jb-ub-mail-ur9