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

* commit '5c000ae700757688209a961a2c2b8d42a01c8a98':
  IMS: merge option not shown after srvcc