Merge "Clean up PowerAdvisor callbacks in Display"