Merge "Simplify call assistant setting" into lmp-mr1-dev