Merge "Turn session actions on by default and add layout flag"