Slight reordering and add settings to compose menu

Bug: 5189476
Change-Id: I91fc0a718859fb55c79157236268dd6976ac0427
3 files changed