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

* commit '126973d460a90c5cac90cf6dffee002e6248122c':
  Restore session params "no decoration" flag