Merge "Resolves null pointer error in AttentionManagerService"