Merge "Fix bug 3347747 - Use a better context when fetching resources for action modes" into honeycomb