am 616ae85e: am 126973d4: am 405eceb2: Merge "Restore session params "no decoration" flag" into mnc-dev

* commit '616ae85e83ba00aab8ec8bf0731a4dee1734823c':
  Restore session params "no decoration" flag