Merge "Email: Customize the Email account's signature" into android_ui.lnx.2.1-dev