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

Change-Id: I00b603c3bcc4da09d95e1feb8d80bac2626b6b26