Merge "wrapping actions container in a scroll view"