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

* commit '405eceb20a3f3e7a22d922fc2d0fb8283be337fa':
  Restore session params "no decoration" flag