Merge "Invalidate the options menu on visibility changes."