Merge "Fix bug 3300456 - Prevent duplicate action bar backgrounds in shared container"