Merge "openOptionsMenu() should be run on the UI thread" into oreo-cts-dev