Work around a toolbar display issue with the latest version of Android.
