Merge "Fix regression in expanded action view up" into jb-mr1.1-dev