Merge "Clean up lint warnings in popup menu presenter classes"