Merge "Fix a bug resolving the correct icon/logo in action bars"