am ae7dc63b: Merge "IMS: merge option not shown after srvcc" into mnc-dev

* commit 'ae7dc63b997ddab41a1fbf9db59d18322ce49ef8':
  IMS: merge option not shown after srvcc