Exception On Resume

Hello,

I'm getting the below exception on Android when resuming an app from clicking on a push notification.

Platform.LayoutRootPage (Xamarin.Forms.Page page, System.Int32 width, System.Int32 height)
System.NullReferenceException: Object reference not set to an instance of an object
Platform.LayoutRootPage (Xamarin.Forms.Page page, System.Int32 width, System.Int32 height)
IPlatformLayout.OnLayout (System.Boolean changed, System.Int32 l, System.Int32 t, System.Int32 r, System.Int32 b)
PlatformRenderer.OnLayout (System.Boolean changed, System.Int32 l, System.Int32 t, System.Int32 r, System.Int32 b)
ViewGroup.n_OnLayout_ZIIII (System.IntPtr jnienv, System.IntPtr native__this, System.Boolean changed, System.Int32 l, System.Int32 t,       System.Int32 r, System.Int32 b)
(wrapper dynamic-method) System.Object.44a2ab36-fd3c-4b03-8761-78b3d1b454b7(intptr,intptr,bool,int,int,int,int)

There is a bug filed here:
https://bugzilla.xamarin.com/show_bug.cgi?id=60346

Using FormsApplicationActivity doesn't seem to be a good workaround for me as I need to support material design.