Merge "Ensure that the action views are always updated." into oc-dev am: f8e7cbffb9
am: 8c11b89baf

Change-Id: I775435bcf1de8ad6a36cbb407d6eb293cb0b76bc