diff --git a/Covid19Radar/Covid19Radar.Android/Covid19Radar.Android.csproj b/Covid19Radar/Covid19Radar.Android/Covid19Radar.Android.csproj
index 214f1fa36..9563eb51c 100644
--- a/Covid19Radar/Covid19Radar.Android/Covid19Radar.Android.csproj
+++ b/Covid19Radar/Covid19Radar.Android/Covid19Radar.Android.csproj
@@ -49,6 +49,7 @@
     <BundleAssemblies>true</BundleAssemblies>
     <AndroidEnableMultiDex>true</AndroidEnableMultiDex>
     <AndroidDexTool>d8</AndroidDexTool>
+    <LangVersion>default</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugSymbols>false</DebugSymbols>
@@ -72,6 +73,8 @@
     <AndroidDexTool>d8</AndroidDexTool>
     <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
     <AndroidEnableMultiDex>true</AndroidEnableMultiDex>
+    <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
+    <LangVersion>default</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Local|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -80,7 +83,7 @@
     <DebugType>full</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-    <LangVersion>8.0</LangVersion>
+    <LangVersion>default</LangVersion>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <AndroidPackageFormat>apk</AndroidPackageFormat>
@@ -94,8 +97,7 @@
     <EnableLLVM>false</EnableLLVM>
     <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
     <MandroidI18n>CJK</MandroidI18n>
-    <AndroidHttpClientHandlerType>
-    </AndroidHttpClientHandlerType>
+    <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
     <AndroidDexTool>d8</AndroidDexTool>
     <AndroidEnableMultiDex>true</AndroidEnableMultiDex>
   </PropertyGroup>
@@ -106,7 +108,7 @@
     <DebugType>full</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-    <LangVersion>8.0</LangVersion>
+    <LangVersion>default</LangVersion>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <AndroidUseSharedRuntime>true</AndroidUseSharedRuntime>
@@ -115,6 +117,7 @@
     <AndroidPackageFormat>apk</AndroidPackageFormat>
     <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
     <MandroidI18n>CJK</MandroidI18n>
+    <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Mono.Android" />
@@ -176,7 +179,7 @@
       <Version>4.6.0.967</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.GooglePlayServices.Nearby.ExposureNotification">
-      <Version>18.0.2-eap.6</Version>
+      <Version>19.7.1-eap.1</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.GooglePlayServices.SafetyNet">
       <Version>117.0.0-preview03</Version>
diff --git a/Covid19Radar/Covid19Radar.Android/Resources/xml/backup_settings.xml b/Covid19Radar/Covid19Radar.Android/Resources/xml/backup_settings.xml
index ea5829fb1..b70ecc024 100644
--- a/Covid19Radar/Covid19Radar.Android/Resources/xml/backup_settings.xml
+++ b/Covid19Radar/Covid19Radar.Android/Resources/xml/backup_settings.xml
@@ -5,4 +5,4 @@
 
 <full-backup-content>
     <exclude domain="file" path="logs" />
-</full-backup-content>
\ No newline at end of file
+</full-backup-content>
diff --git a/Covid19Radar/Covid19Radar.Android/appcenter-pre-build.sh b/Covid19Radar/Covid19Radar.Android/appcenter-pre-build.sh
index e120e9420..5ad9f680b 100644
--- a/Covid19Radar/Covid19Radar.Android/appcenter-pre-build.sh
+++ b/Covid19Radar/Covid19Radar.Android/appcenter-pre-build.sh
@@ -32,9 +32,3 @@ sed -i '' "s/LOG_STORAGE_ACCOUNT_NAME/$LOG_STORAGE_ACCOUNT_NAME/g" $APP_CONSTANT
 cat $APP_CONSTANT_FILE
 
 echo "Updated id!"
-
-# To avoid the following
-# https://github.com/xamarin/xamarin-android/issues/5499
-${ANDROID_HOME}/tools/bin/sdkmanager --uninstall "ndk-bundle"
-${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.3.6528147"
-ln -s ${ANDROID_HOME}/ndk/21.3.6528147 ${ANDROID_HOME}/ndk-bundle
\ No newline at end of file
diff --git a/Covid19Radar/Covid19Radar.iOS/AppDelegate.cs b/Covid19Radar/Covid19Radar.iOS/AppDelegate.cs
index 434a87efd..a0b642847 100644
--- a/Covid19Radar/Covid19Radar.iOS/AppDelegate.cs
+++ b/Covid19Radar/Covid19Radar.iOS/AppDelegate.cs
@@ -2,6 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+using Covid19Radar.Common;
 using Covid19Radar.iOS.Services;
 using Covid19Radar.iOS.Services.Logs;
 using Covid19Radar.Services;
@@ -9,11 +10,12 @@
 using DryIoc;
 using Foundation;
 using UIKit;
+using Xamarin.Forms;
 
 namespace Covid19Radar.iOS
 {
-    // The UIApplicationDelegate for the application. This class is responsible for launching the 
-    // User Interface of the application, as well as listening (and optionally responding) to 
+    // The UIApplicationDelegate for the application. This class is responsible for launching the
+    // User Interface of the application, as well as listening (and optionally responding) to
     // application events from iOS.
     [Register("AppDelegate")]
     public partial class AppDelegate : global::Xamarin.Forms.Platform.iOS.FormsApplicationDelegate
@@ -24,7 +26,7 @@ public AppDelegate()
         }
 
         //
-        // This method is invoked when the application has loaded and is ready to run. In this 
+        // This method is invoked when the application has loaded and is ready to run. In this
         // method you should instantiate the window, load the UI into it and then make the window
         // visible.
         //
@@ -56,6 +58,12 @@ public override bool FinishedLaunching(UIApplication app, NSDictionary options)
             return base.FinishedLaunching(app, options);
         }
 
+        public override void OnActivated(UIApplication uiApplication)
+        {
+            base.OnActivated(uiApplication);
+            MessagingCenter.Send((object)this, AppConstants.IosOnActivatedMessage);
+        }
+
         //public override void WillEnterForeground(UIApplication uiApplication)
         //{
         //    Plugin.LocalNotification.NotificationCenter.ResetApplicationIconBadgeNumber(uiApplication);
diff --git a/Covid19Radar/Covid19Radar.iOS/Covid19Radar.iOS.csproj b/Covid19Radar/Covid19Radar.iOS/Covid19Radar.iOS.csproj
index 5b06b1724..30a4d35aa 100644
--- a/Covid19Radar/Covid19Radar.iOS/Covid19Radar.iOS.csproj
+++ b/Covid19Radar/Covid19Radar.iOS/Covid19Radar.iOS.csproj
@@ -1175,8 +1175,6 @@
     <EmbeddedResource Include="fa-brands-400.otf" />
     <EmbeddedResource Include="fa-regular-400.otf" />
     <EmbeddedResource Include="fa-solid-900.otf" />
-    <EmbeddedResource Include="NotoSansCJKjp-Medium.otf" />
-    <EmbeddedResource Include="NotoSansCJKjp-Regular.otf" />
     <EmbeddedResource Include="Roboto-Regular.ttf" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Covid19Radar/Covid19Radar.iOS/NotoSansCJKjp-Medium.otf b/Covid19Radar/Covid19Radar.iOS/NotoSansCJKjp-Medium.otf
deleted file mode 100644
index 9b3358680..000000000
Binary files a/Covid19Radar/Covid19Radar.iOS/NotoSansCJKjp-Medium.otf and /dev/null differ
diff --git a/Covid19Radar/Covid19Radar.iOS/NotoSansCJKjp-Regular.otf b/Covid19Radar/Covid19Radar.iOS/NotoSansCJKjp-Regular.otf
deleted file mode 100644
index 296fbebd8..000000000
Binary files a/Covid19Radar/Covid19Radar.iOS/NotoSansCJKjp-Regular.otf and /dev/null differ
diff --git a/Covid19Radar/Covid19Radar/App.xaml b/Covid19Radar/Covid19Radar/App.xaml
index c3f7fbfb1..b14de6c32 100644
--- a/Covid19Radar/Covid19Radar/App.xaml
+++ b/Covid19Radar/Covid19Radar/App.xaml
@@ -128,7 +128,6 @@
             </Style>
 
             <Style x:Key="DefaultEntry" TargetType="Entry">
-                <Setter Property="FontFamily" Value="NotoSansRegularFontFamily" />
                 <Setter Property="BackgroundColor" Value="Transparent" />
                 <Setter Property="TextColor" Value="{StaticResource PrimaryText}" />
                 <Setter Property="PlaceholderColor" Value="{StaticResource SecondaryText}" />
@@ -144,7 +143,6 @@
             </Style>
 
             <Style x:Key="DefaultDatePicker" TargetType="DatePicker">
-                <Setter Property="FontFamily" Value="NotoSansRegularFontFamily" />
                 <Setter Property="BackgroundColor" Value="Transparent" />
                 <Setter Property="TextColor" Value="{StaticResource PrimaryText}" />
                 <Setter Property="Opacity" Value="0.6" />
@@ -156,7 +154,6 @@
                 <Setter Property="FontAttributes" Value="Bold" />
                 <Setter Property="FontSize" Value="Title" />
                 <Setter Property="HorizontalOptions" Value="FillAndExpand" />
-                <Setter Property="FontFamily" Value="NotoSansMediumFontFamily" />
             </Style>
 
             <Style x:Key="DefaultTitleLabel" TargetType="Label">
@@ -165,7 +162,6 @@
                 <Setter Property="FontAttributes" Value="Bold" />
                 <Setter Property="FontSize" Value="Title" />
                 <Setter Property="HorizontalOptions" Value="FillAndExpand" />
-                <Setter Property="FontFamily" Value="NotoSansMediumFontFamily" />
             </Style>
 
             <Style x:Key="DefaultSubTitleLabelColor" TargetType="Label">
@@ -173,7 +169,6 @@
                 <Setter Property="TextColor" Value="{StaticResource Primary}" />
                 <Setter Property="FontSize" Value="Subtitle" />
                 <Setter Property="HorizontalOptions" Value="FillAndExpand" />
-                <Setter Property="FontFamily" Value="NotoSansMediumFontFamily" />
             </Style>
 
             <Style x:Key="DefaultSubTitleLabel" TargetType="Label">
@@ -181,7 +176,6 @@
                 <Setter Property="TextColor" Value="{StaticResource PrimaryText}" />
                 <Setter Property="FontSize" Value="{x:OnPlatform Android=18, iOS=20}" />
                 <Setter Property="HorizontalOptions" Value="FillAndExpand" />
-                <Setter Property="FontFamily" Value="NotoSansMediumFontFamily" />
             </Style>
 
             <Style x:Key="DefaultLabelLarge" TargetType="Label">
@@ -189,7 +183,6 @@
                 <Setter Property="TextColor" Value="{StaticResource PrimaryText}" />
                 <Setter Property="FontSize" Value="Large" />
                 <Setter Property="HorizontalOptions" Value="FillAndExpand" />
-                <Setter Property="FontFamily" Value="NotoSansRegularFontFamily" />
             </Style>
 
             <Style x:Key="DefaultLabelLargeColor" TargetType="Label">
@@ -197,7 +190,6 @@
                 <Setter Property="TextColor" Value="{StaticResource Primary}" />
                 <Setter Property="FontSize" Value="Large" />
                 <Setter Property="HorizontalOptions" Value="FillAndExpand" />
-                <Setter Property="FontFamily" Value="NotoSansRegularFontFamily" />
             </Style>
 
             <Style x:Key="DefaultLabelColor" TargetType="Label">
@@ -205,7 +197,6 @@
                 <Setter Property="TextColor" Value="{StaticResource Primary}" />
                 <Setter Property="FontSize" Value="Medium" />
                 <Setter Property="HorizontalOptions" Value="FillAndExpand" />
-                <Setter Property="FontFamily" Value="NotoSansRegularFontFamily" />
             </Style>
 
             <Style x:Key="DefaultLabel" TargetType="Label">
@@ -213,7 +204,6 @@
                 <Setter Property="TextColor" Value="{StaticResource PrimaryText}" />
                 <Setter Property="FontSize" Value="Medium" />
                 <Setter Property="HorizontalOptions" Value="FillAndExpand" />
-                <Setter Property="FontFamily" Value="NotoSansRegularFontFamily" />
             </Style>
 
 
@@ -222,7 +212,6 @@
                 <Setter Property="TextColor" Value="{StaticResource Primary}" />
                 <Setter Property="FontSize" Value="Small" />
                 <Setter Property="HorizontalOptions" Value="FillAndExpand" />
-                <Setter Property="FontFamily" Value="NotoSansRegularFontFamily" />
             </Style>
 
 
@@ -231,7 +220,6 @@
                 <Setter Property="TextColor" Value="{StaticResource PrimaryText}" />
                 <Setter Property="FontSize" Value="Small" />
                 <Setter Property="HorizontalOptions" Value="FillAndExpand" />
-                <Setter Property="FontFamily" Value="NotoSansRegularFontFamily" />
             </Style>
 
             <Style x:Key="DefaultLabelMicro" TargetType="Label">
@@ -239,7 +227,6 @@
                 <Setter Property="TextColor" Value="{StaticResource PrimaryText}" />
                 <Setter Property="FontSize" Value="Micro" />
                 <Setter Property="HorizontalOptions" Value="FillAndExpand" />
-                <Setter Property="FontFamily" Value="NotoSansRegularFontFamily" />
             </Style>
 
             <Style x:Key="DefaultActivityIndicator" TargetType="ActivityIndicator">
@@ -252,7 +239,6 @@
                 <Setter Property="TextColor" Value="{StaticResource Primary}" />
                 <Setter Property="FontSize" Value="Medium" />
                 <Setter Property="HorizontalOptions" Value="FillAndExpand" />
-                <Setter Property="FontFamily" Value="NotoSansRegularFontFamily" />
             </Style>
 
             <Style x:Key="DefaultNumberLabel" TargetType="Label">
@@ -284,7 +270,6 @@
                 <Setter Property="HorizontalOptions" Value="FillAndExpand" />
                 <Setter Property="VerticalTextAlignment" Value="Center" />
                 <Setter Property="Margin" Value="0,0,0,0" />
-                <Setter Property="FontFamily" Value="NotoSansRegularFontFamily" />
             </Style>
 
             <Style x:Key="DefaultWebView" TargetType="WebView">
@@ -305,7 +290,6 @@
 
             <Style x:Key="DefaultButton" TargetType="Button">
                 <Setter Property="Visual" Value="Default" />
-                <Setter Property="FontFamily" Value="NotoSansMediumFontFamily" />
                 <Setter Property="FontAttributes" Value="Bold" />
                 <Setter Property="BorderColor" Value="{StaticResource ButtonBorder}" />
                 <Setter Property="BorderWidth" Value="4" />
@@ -329,7 +313,6 @@
 
             <Style x:Key="DefaultButtonGrayedOut" TargetType="Button">
                 <Setter Property="Visual" Value="Default" />
-                <Setter Property="FontFamily" Value="NotoSansMediumFontFamily" />
                 <Setter Property="FontAttributes" Value="Bold" />
                 <Setter Property="BorderColor" Value="{StaticResource ButtonGrayedOut}" />
                 <Setter Property="BorderWidth" Value="2" />
@@ -349,7 +332,6 @@
                 <Setter Property="TextColor" Value="{StaticResource PrimaryText}" />
                 <Setter Property="FontSize" Value="Medium" />
                 <Setter Property="HorizontalOptions" Value="FillAndExpand" />
-                <Setter Property="FontFamily" Value="NotoSansRegularFontFamily" />
                 <Setter Property="VerticalTextAlignment" Value="Center" />
             </Style>
 
@@ -359,7 +341,6 @@
                 <Setter Property="HorizontalTextAlignment" Value="Start" />
                 <Setter Property="TextColor" Value="{StaticResource Primary}" />
                 <Setter Property="FontSize" Value="Small" />
-                <Setter Property="FontFamily" Value="NotoSansRegularFontFamily" />
             </Style>
 
 
@@ -367,7 +348,6 @@
                 <Setter Property="HorizontalTextAlignment" Value="Start" />
                 <Setter Property="TextColor" Value="{StaticResource PrimaryText}" />
                 <Setter Property="FontSize" Value="Small" />
-                <Setter Property="FontFamily" Value="NotoSansRegularFontFamily" />
             </Style>
 
             <Style x:Key="ImageLableStackLayout" TargetType="StackLayout">
diff --git a/Covid19Radar/Covid19Radar/App.xaml.cs b/Covid19Radar/Covid19Radar/App.xaml.cs
index 229aa6233..015b4ead1 100644
--- a/Covid19Radar/Covid19Radar/App.xaml.cs
+++ b/Covid19Radar/Covid19Radar/App.xaml.cs
@@ -32,7 +32,7 @@ public partial class App : PrismApplication
         private ILoggerService LoggerService;
         private ILogFileService LogFileService;
 
-        /* 
+        /*
          * The Xamarin Forms XAML Previewer in Visual Studio uses System.Activator.CreateInstance.
          * This imposes a limitation in which the App class must have a default constructor.
          * App(IPlatformInitializer initializer = null) cannot be handled by the Activator.
@@ -192,6 +192,7 @@ protected override void OnStart()
 
         protected override void OnResume()
         {
+            base.OnResume();
             LogFileService.Rotate();
         }
 
@@ -204,6 +205,7 @@ public async Task InitializeBackgroundTasks()
         */
         protected override void OnSleep()
         {
+            base.OnSleep();
         }
 
         private void LogUnobservedTaskExceptions()
diff --git a/Covid19Radar/Covid19Radar/AssemblyInfo.cs b/Covid19Radar/Covid19Radar/AssemblyInfo.cs
index 5dfa1ab02..a424dd161 100644
--- a/Covid19Radar/Covid19Radar/AssemblyInfo.cs
+++ b/Covid19Radar/Covid19Radar/AssemblyInfo.cs
@@ -7,6 +7,4 @@
 [assembly: ExportFont("fa-solid-900.otf", Alias = "FA-S")]
 [assembly: ExportFont("fa-brands-400.otf", Alias = "FA-B")]
 [assembly: ExportFont("materialdesignicons-webfont.ttf", Alias = "MaterialFontFamily")]
-[assembly: ExportFont("NotoSansCJKjp-Medium.otf", Alias = "NotoSansMediumFontFamily")]
-[assembly: ExportFont("NotoSansCJKjp-Regular.otf", Alias = "NotoSansRegularFontFamily")]
 [assembly: ExportFont("Roboto-Regular.ttf", Alias = "RobotoRegularFontFamily")]
diff --git a/Covid19Radar/Covid19Radar/Common/AppConstants.cs b/Covid19Radar/Covid19Radar/Common/AppConstants.cs
index e0a3f978f..04c78ec2f 100644
--- a/Covid19Radar/Covid19Radar/Common/AppConstants.cs
+++ b/Covid19Radar/Covid19Radar/Common/AppConstants.cs
@@ -30,5 +30,14 @@ public static class AppConstants
 
         public const string positiveRegex = @"\b[0-9]{8}\b";
 
+        /// <summary>
+        /// Number of days of exposure information to display
+        /// </summary>
+        public const int DaysOfExposureInformationToDisplay = -15;
+
+        /// <summary>
+        /// Message when `AppDelagate.OnActivated()` occurs on iOS.
+        /// </summary>
+        public const string IosOnActivatedMessage = "IosOnActivatedMessage";
     }
 }
diff --git a/Covid19Radar/Covid19Radar/Common/DateTimeUtility.cs b/Covid19Radar/Covid19Radar/Common/DateTimeUtility.cs
new file mode 100644
index 000000000..2819da94e
--- /dev/null
+++ b/Covid19Radar/Covid19Radar/Common/DateTimeUtility.cs
@@ -0,0 +1,18 @@
+using System;
+namespace Covid19Radar.Common
+{
+    public interface IDateTimeUtility
+    {
+        DateTime UtcNow { get; }
+    }
+    public class DateTimeUtility : IDateTimeUtility
+    {
+        public static IDateTimeUtility Instance = new DateTimeUtility();
+
+        public DateTimeUtility()
+        {
+        }
+
+        public DateTime UtcNow => DateTime.UtcNow;
+    }
+}
diff --git a/Covid19Radar/Covid19Radar/Covid19Radar.csproj b/Covid19Radar/Covid19Radar/Covid19Radar.csproj
index 7576ab0e0..451883163 100644
--- a/Covid19Radar/Covid19Radar/Covid19Radar.csproj
+++ b/Covid19Radar/Covid19Radar/Covid19Radar.csproj
@@ -86,8 +86,6 @@
     <None Remove="Resources\Fonts\fa-regular-400.otf" />
     <None Remove="Resources\Fonts\fa-solid-900.otf" />
     <None Remove="Resources\Fonts\materialdesignicons-webfont.ttf" />
-    <None Remove="Resources\Fonts\NotoSansCJKjp-Medium.otf" />
-    <None Remove="Resources\Fonts\NotoSansCJKjp-Regular.otf" />
     <None Remove="Resources\Fonts\Roboto-Regular.ttf" />
     <None Remove="Services\ExposureNotificationHandler.cs.txt" />
     <None Remove="settings.json" />
@@ -99,8 +97,6 @@
     <EmbeddedResource Include="Resources\Fonts\fa-regular-400.otf" />
     <EmbeddedResource Include="Resources\Fonts\fa-solid-900.otf" />
     <EmbeddedResource Include="Resources\Fonts\materialdesignicons-webfont.ttf" />
-    <EmbeddedResource Include="Resources\Fonts\NotoSansCJKjp-Medium.otf" />
-    <EmbeddedResource Include="Resources\Fonts\NotoSansCJKjp-Regular.otf" />
     <EmbeddedResource Include="Resources\Fonts\Roboto-Regular.ttf" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Covid19Radar/Covid19Radar/MultilingualResources/Covid19Radar.zh-Hans.xlf b/Covid19Radar/Covid19Radar/MultilingualResources/Covid19Radar.zh-Hans.xlf
index 4d6dc778e..fb31b069d 100644
--- a/Covid19Radar/Covid19Radar/MultilingualResources/Covid19Radar.zh-Hans.xlf
+++ b/Covid19Radar/Covid19Radar/MultilingualResources/Covid19Radar.zh-Hans.xlf
@@ -93,8 +93,7 @@
         </trans-unit>
         <trans-unit id="SettingsPageTitle" translate="yes" xml:space="preserve">
           <source>Settings</source>
-          <target state="needs-review-translation">设置</target>
-          <note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
+          <target state="translated">设置</target>
           <note from="MultilingualBuild" annotates="source" priority="2">アプリの設定</note>
         </trans-unit>
         <trans-unit id="ButtonCancel" translate="yes" xml:space="preserve">
diff --git a/Covid19Radar/Covid19Radar/Resources/Fonts/NotoSansCJKjp-Medium.otf b/Covid19Radar/Covid19Radar/Resources/Fonts/NotoSansCJKjp-Medium.otf
deleted file mode 100644
index 9b3358680..000000000
Binary files a/Covid19Radar/Covid19Radar/Resources/Fonts/NotoSansCJKjp-Medium.otf and /dev/null differ
diff --git a/Covid19Radar/Covid19Radar/Resources/Fonts/NotoSansCJKjp-Regular.otf b/Covid19Radar/Covid19Radar/Resources/Fonts/NotoSansCJKjp-Regular.otf
deleted file mode 100644
index 296fbebd8..000000000
Binary files a/Covid19Radar/Covid19Radar/Resources/Fonts/NotoSansCJKjp-Regular.otf and /dev/null differ
diff --git a/Covid19Radar/Covid19Radar/Services/ExposureNotificationService.cs b/Covid19Radar/Covid19Radar/Services/ExposureNotificationService.cs
index e381ca4e9..3bf586c20 100644
--- a/Covid19Radar/Covid19Radar/Services/ExposureNotificationService.cs
+++ b/Covid19Radar/Covid19Radar/Services/ExposureNotificationService.cs
@@ -31,10 +31,12 @@ public interface IExposureNotificationService
         Task FetchExposureKeyAsync();
 
         List<UserExposureInfo> GetExposureInformationList();
-        int GetExposureCount();
         void SetExposureInformation(UserExposureSummary summary, List<UserExposureInfo> informationList);
         void RemoveExposureInformation();
 
+        List<UserExposureInfo> GetExposureInformationListToDisplay();
+        int GetExposureCountToDisplay();
+
         Task<string> UpdateStatusMessageAsync();
         Task<bool> StartExposureNotification();
         Task<bool> StopExposureNotification();
@@ -111,24 +113,32 @@ public async Task MigrateFromUserData(UserDataModel userData)
         private async Task GetExposureNotificationConfig()
         {
             loggerService.StartMethod();
-
-            string container = AppSettings.Instance.BlobStorageContainerName;
-            string url = AppSettings.Instance.CdnUrlBase + $"{container}/Configration.json";
-            HttpClient httpClient = httpClientService.Create();
-            Task<HttpResponseMessage> response = httpClient.GetAsync(url);
-            HttpResponseMessage result = await response;
-            if (result.StatusCode == System.Net.HttpStatusCode.OK)
+            try
             {
-                loggerService.Info("Success to download configuration");
-                var content = await result.Content.ReadAsStringAsync();
-                preferencesService.SetValue(PreferenceKey.ExposureNotificationConfiguration, content);
+                string container = AppSettings.Instance.BlobStorageContainerName;
+                string url = AppSettings.Instance.CdnUrlBase + $"{container}/Configration.json";
+                HttpClient httpClient = httpClientService.Create();
+                Task<HttpResponseMessage> response = httpClient.GetAsync(url);
+                HttpResponseMessage result = await response;
+                if (result.StatusCode == System.Net.HttpStatusCode.OK)
+                {
+                    loggerService.Info("Success to download configuration");
+                    var content = await result.Content.ReadAsStringAsync();
+                    preferencesService.SetValue(PreferenceKey.ExposureNotificationConfiguration, content);
+                }
+                else
+                {
+                    loggerService.Error("Fail to download configuration");
+                }
             }
-            else
+            catch (Exception ex)
             {
-                loggerService.Error("Fail to download configuration");
+                loggerService.Exception("Failed download of exposure notification configuration.", ex);
+            }
+            finally
+            {
+                loggerService.EndMethod();
             }
-
-            loggerService.EndMethod();
         }
 
         public Configuration GetConfiguration()
@@ -214,19 +224,6 @@ public List<UserExposureInfo> GetExposureInformationList()
             return result;
         }
 
-        public int GetExposureCount()
-        {
-            loggerService.StartMethod();
-            int result = 0;
-            var exposureInformationList = GetExposureInformationList();
-            if (exposureInformationList != null)
-            {
-                result = exposureInformationList.Count;
-            }
-            loggerService.EndMethod();
-            return result;
-        }
-
         public void SetExposureInformation(UserExposureSummary summary, List<UserExposureInfo> informationList)
         {
             loggerService.StartMethod();
@@ -245,6 +242,29 @@ public void RemoveExposureInformation()
             loggerService.EndMethod();
         }
 
+        public List<UserExposureInfo> GetExposureInformationListToDisplay()
+        {
+            loggerService.StartMethod();
+            var list = GetExposureInformationList()?
+                .Where(x => x.Timestamp.CompareTo(DateTimeUtility.Instance.UtcNow.AddDays(AppConstants.DaysOfExposureInformationToDisplay)) >= 0)
+                .ToList();
+            loggerService.EndMethod();
+            return list;
+        }
+
+        public int GetExposureCountToDisplay()
+        {
+            loggerService.StartMethod();
+            int result = 0;
+            var exposureInformationList = GetExposureInformationListToDisplay();
+            if (exposureInformationList != null)
+            {
+                result = exposureInformationList.Count;
+            }
+            loggerService.EndMethod();
+            return result;
+        }
+
         public async Task<string> UpdateStatusMessageAsync()
         {
             loggerService.StartMethod();
diff --git a/Covid19Radar/Covid19Radar/Services/HttpDataService.cs b/Covid19Radar/Covid19Radar/Services/HttpDataService.cs
index 76aa551ad..4d4dbd9cd 100644
--- a/Covid19Radar/Covid19Radar/Services/HttpDataService.cs
+++ b/Covid19Radar/Covid19Radar/Services/HttpDataService.cs
@@ -66,7 +66,7 @@ public async Task<bool> PostRegisterUserAsync()
                     return true;
                 }
             }
-            catch (HttpRequestException ex)
+            catch (Exception ex)
             {
                 loggerService.Exception("Failed to register user.", ex);
             }
diff --git a/Covid19Radar/Covid19Radar/Services/Logs/LogFileService.cs b/Covid19Radar/Covid19Radar/Services/Logs/LogFileService.cs
index 79c268b5d..ea2a0aced 100644
--- a/Covid19Radar/Covid19Radar/Services/Logs/LogFileService.cs
+++ b/Covid19Radar/Covid19Radar/Services/Logs/LogFileService.cs
@@ -188,4 +188,4 @@ private bool ShouldDeleteFile(DateTime[] dateTimes, string fileName)
 
         #endregion
     }
-}
\ No newline at end of file
+}
diff --git a/Covid19Radar/Covid19Radar/ViewModels/HelpPage/HelpPage2ViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/HelpPage/HelpPage2ViewModel.cs
index ffff7a897..4e3e88265 100644
--- a/Covid19Radar/Covid19Radar/ViewModels/HelpPage/HelpPage2ViewModel.cs
+++ b/Covid19Radar/Covid19Radar/ViewModels/HelpPage/HelpPage2ViewModel.cs
@@ -28,4 +28,4 @@ public HelpPage2ViewModel(INavigationService navigationService, ILoggerService l
             loggerService.EndMethod();
         });
     }
-}
\ No newline at end of file
+}
diff --git a/Covid19Radar/Covid19Radar/ViewModels/HelpPage/HelpPage3ViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/HelpPage/HelpPage3ViewModel.cs
index 54200b078..8976b1459 100644
--- a/Covid19Radar/Covid19Radar/ViewModels/HelpPage/HelpPage3ViewModel.cs
+++ b/Covid19Radar/Covid19Radar/ViewModels/HelpPage/HelpPage3ViewModel.cs
@@ -29,4 +29,4 @@ public HelpPage3ViewModel(INavigationService navigationService, ILoggerService l
         });
 
     }
-}
\ No newline at end of file
+}
diff --git a/Covid19Radar/Covid19Radar/ViewModels/HomePage/ContactedNotifyPageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/HomePage/ContactedNotifyPageViewModel.cs
index 1975c357b..f80b11ca8 100644
--- a/Covid19Radar/Covid19Radar/ViewModels/HomePage/ContactedNotifyPageViewModel.cs
+++ b/Covid19Radar/Covid19Radar/ViewModels/HomePage/ContactedNotifyPageViewModel.cs
@@ -25,7 +25,7 @@ public ContactedNotifyPageViewModel(INavigationService navigationService, ILogge
         {
             Title = AppResources.TitileUserStatusSettings;
             this.loggerService = loggerService;
-            ExposureCount = exposureNotificationService.GetExposureCount().ToString();
+            ExposureCount = exposureNotificationService.GetExposureCountToDisplay().ToString();
         }
 
         public Command OnClickByForm => new Command(async () =>
diff --git a/Covid19Radar/Covid19Radar/ViewModels/HomePage/ExposuresPageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/HomePage/ExposuresPageViewModel.cs
index 66708ccae..6c90e256c 100644
--- a/Covid19Radar/Covid19Radar/ViewModels/HomePage/ExposuresPageViewModel.cs
+++ b/Covid19Radar/Covid19Radar/ViewModels/HomePage/ExposuresPageViewModel.cs
@@ -25,7 +25,7 @@ public ExposuresPageViewModel(INavigationService navigationService, IExposureNot
             Title = Resources.AppResources.MainExposures;
             _exposures = new ObservableCollection<ExposureSummary>();
 
-            var exposureInformationList = exposureNotificationService.GetExposureInformationList();
+            var exposureInformationList = exposureNotificationService.GetExposureInformationListToDisplay();
             if (exposureInformationList != null)
             {
                 foreach (var en in exposureInformationList.GroupBy(eni => eni.Timestamp))
diff --git a/Covid19Radar/Covid19Radar/ViewModels/HomePage/HomePageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/HomePage/HomePageViewModel.cs
index 4c3dceb14..a0bde1481 100644
--- a/Covid19Radar/Covid19Radar/ViewModels/HomePage/HomePageViewModel.cs
+++ b/Covid19Radar/Covid19Radar/ViewModels/HomePage/HomePageViewModel.cs
@@ -46,12 +46,18 @@ public override async void Initialize(INavigationParameters parameters)
         {
             loggerService.StartMethod();
 
+            // It seems the life cycle methods are not called after background fetch in iOS.
+            // The days of use will be updated at this time.
+            MessagingCenter.Unsubscribe<object>(this, AppConstants.IosOnActivatedMessage);
+            MessagingCenter.Subscribe<object>(this, AppConstants.IosOnActivatedMessage, (sender) =>
+            {
+                SettingDaysOfUse();
+            });
+
             var startDate = userDataService.GetStartDate();
             StartDate = startDate.ToLocalTime().ToString("D");
 
-            var daysOfUse = userDataService.GetDaysOfUse();
-            PastDate = daysOfUse.ToString();
-
+            SettingDaysOfUse();
 
             // Check Version
             AppUtils.CheckVersion(loggerService);
@@ -80,7 +86,7 @@ public override async void Initialize(INavigationParameters parameters)
         {
             loggerService.StartMethod();
 
-            var count = exposureNotificationService.GetExposureCount();
+            var count = exposureNotificationService.GetExposureCountToDisplay();
             loggerService.Info($"Exposure count: {count}");
             if (count > 0)
             {
@@ -104,5 +110,25 @@ public override async void Initialize(INavigationParameters parameters)
 
            loggerService.EndMethod();
        });
+
+        private void SettingDaysOfUse()
+        {
+            loggerService.StartMethod();
+            var daysOfUse = userDataService.GetDaysOfUse();
+            PastDate = daysOfUse.ToString();
+            loggerService.EndMethod();
+        }
+
+        public override void OnAppearing()
+        {
+            base.OnAppearing();
+            SettingDaysOfUse();
+        }
+
+        public override void OnResume()
+        {
+            base.OnResume();
+            SettingDaysOfUse();
+        }
     }
 }
diff --git a/Covid19Radar/Covid19Radar/ViewModels/HomePage/NotifyOtherPageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/HomePage/NotifyOtherPageViewModel.cs
index 67364b6a7..60329f224 100644
--- a/Covid19Radar/Covid19Radar/ViewModels/HomePage/NotifyOtherPageViewModel.cs
+++ b/Covid19Radar/Covid19Radar/ViewModels/HomePage/NotifyOtherPageViewModel.cs
@@ -80,7 +80,7 @@ public NotifyOtherPageViewModel(INavigationService navigationService, ILoggerSer
         {
             loggerService.StartMethod();
 
-            var result = await UserDialogs.Instance.ConfirmAsync(AppResources.NotifyOtherPageDiag1Message, AppResources.NotifyOtherPageDiag1Title, AppResources.ButtonAgree, AppResources.ButtonCancel);
+            var result = await UserDialogs.Instance.ConfirmAsync(AppResources.NotifyOtherPageDiag1Message, AppResources.NotifyOtherPageDiag1Title, AppResources.NotifyOtherPageButton, AppResources.ButtonCancel);
             if (!result)
             {
                 await UserDialogs.Instance.AlertAsync(
diff --git a/Covid19Radar/Covid19Radar/ViewModels/Tutorial/TutorialPage3ViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/Tutorial/TutorialPage3ViewModel.cs
index addffd716..67eba29b5 100644
--- a/Covid19Radar/Covid19Radar/ViewModels/Tutorial/TutorialPage3ViewModel.cs
+++ b/Covid19Radar/Covid19Radar/ViewModels/Tutorial/TutorialPage3ViewModel.cs
@@ -53,4 +53,4 @@ public TutorialPage3ViewModel(INavigationService navigationService, ILoggerServi
             loggerService.EndMethod();
         });
     }
-}
\ No newline at end of file
+}
diff --git a/Covid19Radar/Covid19Radar/ViewModels/Tutorial/TutorialPage4ViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/Tutorial/TutorialPage4ViewModel.cs
index 4ebb624ac..822b47513 100644
--- a/Covid19Radar/Covid19Radar/ViewModels/Tutorial/TutorialPage4ViewModel.cs
+++ b/Covid19Radar/Covid19Radar/ViewModels/Tutorial/TutorialPage4ViewModel.cs
@@ -37,4 +37,4 @@ public TutorialPage4ViewModel(INavigationService navigationService, ILoggerServi
             loggerService.EndMethod();
         });
     }
-}
\ No newline at end of file
+}
diff --git a/Covid19Radar/Covid19Radar/ViewModels/Tutorial/TutorialPage5ViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/Tutorial/TutorialPage5ViewModel.cs
index d0c2763bc..beede3430 100644
--- a/Covid19Radar/Covid19Radar/ViewModels/Tutorial/TutorialPage5ViewModel.cs
+++ b/Covid19Radar/Covid19Radar/ViewModels/Tutorial/TutorialPage5ViewModel.cs
@@ -33,4 +33,4 @@ public TutorialPage5ViewModel(INavigationService navigationService, ILoggerServi
             loggerService.EndMethod();
         });
     }
-}
\ No newline at end of file
+}
diff --git a/Covid19Radar/Covid19Radar/ViewModels/ViewModelBase.cs b/Covid19Radar/Covid19Radar/ViewModels/ViewModelBase.cs
index ad387cb29..e2d70a20f 100644
--- a/Covid19Radar/Covid19Radar/ViewModels/ViewModelBase.cs
+++ b/Covid19Radar/Covid19Radar/ViewModels/ViewModelBase.cs
@@ -2,13 +2,13 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-using Covid19Radar.Services;
+using Prism.AppModel;
 using Prism.Mvvm;
 using Prism.Navigation;
 
 namespace Covid19Radar.ViewModels
 {
-    public class ViewModelBase : BindableBase, IInitialize, INavigationAware, IDestructible
+    public class ViewModelBase : BindableBase, IInitialize, INavigationAware, IDestructible, IPageLifecycleAware, IApplicationLifecycleAware
     {
 
         // Navigation
@@ -51,5 +51,21 @@ public virtual void Destroy()
         {
 
         }
+
+        public virtual void OnAppearing()
+        {
+        }
+
+        public virtual void OnDisappearing()
+        {
+        }
+
+        public virtual void OnResume()
+        {
+        }
+
+        public virtual void OnSleep()
+        {
+        }
     }
 }
diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/HomePage.xaml b/Covid19Radar/Covid19Radar/Views/HomePage/HomePage.xaml
index 2c1477b39..fe4d4e42a 100644
--- a/Covid19Radar/Covid19Radar/Views/HomePage/HomePage.xaml
+++ b/Covid19Radar/Covid19Radar/Views/HomePage/HomePage.xaml
@@ -51,6 +51,7 @@
                     </Label>
                     <Button
                         AutomationId="ButtonExposures"
+                        AutomationProperties.HelpText="{x:Static resources:AppResources.HomePageDescription2}"
                         Command="{Binding Path=OnClickExposures}"
                         Style="{StaticResource DefaultButton}"
                         Text="{x:Static resources:AppResources.HomePageDescription2}" />
diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/NotifyOtherPage.xaml.cs b/Covid19Radar/Covid19Radar/Views/HomePage/NotifyOtherPage.xaml.cs
index 4b87b6b58..6412fe83b 100644
--- a/Covid19Radar/Covid19Radar/Views/HomePage/NotifyOtherPage.xaml.cs
+++ b/Covid19Radar/Covid19Radar/Views/HomePage/NotifyOtherPage.xaml.cs
@@ -25,4 +25,4 @@ void OnRadioButtonCheckedChanged(object sender, CheckedChangedEventArgs e)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/SplashPage.xaml b/Covid19Radar/Covid19Radar/Views/HomePage/SplashPage.xaml
index 9281068b0..76f58c149 100644
--- a/Covid19Radar/Covid19Radar/Views/HomePage/SplashPage.xaml
+++ b/Covid19Radar/Covid19Radar/Views/HomePage/SplashPage.xaml
@@ -11,4 +11,4 @@
         <Image Source="SplashImg.png"
                VerticalOptions="CenterAndExpand" />
     </ContentPage.Content>
-</ContentPage>
\ No newline at end of file
+</ContentPage>
diff --git a/Covid19Radar/Covid19Radar/Views/Settings/SettingsPage.xaml b/Covid19Radar/Covid19Radar/Views/Settings/SettingsPage.xaml
index 682b52645..daa61b55c 100644
--- a/Covid19Radar/Covid19Radar/Views/Settings/SettingsPage.xaml
+++ b/Covid19Radar/Covid19Radar/Views/Settings/SettingsPage.xaml
@@ -39,7 +39,6 @@
                         <Label.FormattedText>
                             <FormattedString>
                                 <Span
-                                    FontFamily="NotoSansRegularFontFamily"
                                     FontSize="Small"
                                     Text="{x:Static resources:AppResources.VersionText}"
                                     TextColor="{StaticResource PrimaryText}" />
@@ -85,13 +84,11 @@
                         <Label.FormattedText>
                             <FormattedString>
                                 <Span
-                                    FontFamily="NotoSansRegularFontFamily"
                                     FontSize="Small"
                                     Text="{x:Static resources:AppResources.SettingsPageLabel3}"
                                     TextColor="{StaticResource PrimaryText}" />
                                 <Span Text="{x:Static System:Environment.NewLine}" />
                                 <Span
-                                    FontFamily="NotoSansRegularFontFamily"
                                     FontSize="Caption"
                                     Text="{x:Static resources:AppResources.SettingsPageDescription3}"
                                     TextColor="{StaticResource SecondaryText}" />
diff --git a/Covid19Radar/Tests/Covid19Radar.UnitTests/Services/ExposureNotificationServiceTests.cs b/Covid19Radar/Tests/Covid19Radar.UnitTests/Services/ExposureNotificationServiceTests.cs
index df5077130..0a91d031a 100644
--- a/Covid19Radar/Tests/Covid19Radar.UnitTests/Services/ExposureNotificationServiceTests.cs
+++ b/Covid19Radar/Tests/Covid19Radar.UnitTests/Services/ExposureNotificationServiceTests.cs
@@ -8,6 +8,7 @@
 using System.Net;
 using System.Net.Http;
 using System.Text.RegularExpressions;
+using Covid19Radar.Common;
 using Covid19Radar.Model;
 using Covid19Radar.Services;
 using Covid19Radar.Services.Logs;
@@ -26,6 +27,7 @@ public class ExposureNotificationServiceTests
         private readonly Mock<ISecureStorageService> mockSecureStorageService;
         private readonly Mock<IPreferencesService> mockPreferencesService;
         private readonly Mock<IApplicationPropertyService> mockApplicationPropertyService;
+        private readonly Mock<IDateTimeUtility> mockDateTimeUtility;
 
         public ExposureNotificationServiceTests()
         {
@@ -35,6 +37,8 @@ public ExposureNotificationServiceTests()
             mockSecureStorageService = mockRepository.Create<ISecureStorageService>();
             mockPreferencesService = mockRepository.Create<IPreferencesService>();
             mockApplicationPropertyService = mockRepository.Create<IApplicationPropertyService>();
+            mockDateTimeUtility = mockRepository.Create<IDateTimeUtility>();
+            DateTimeUtility.Instance = mockDateTimeUtility.Object;
         }
 
         private ExposureNotificationService CreateService()
@@ -158,42 +162,6 @@ public void GetExposureInformationListTests_NoData()
             Assert.Null(result);
         }
 
-        [Fact]
-        public void GetExposureCountTests_Success()
-        {
-            mockHttpClientService.Setup(x => x.Create()).Returns(new HttpClient(new MockHttpHandler((request, cancellationToken) =>
-            {
-                // Make an error not to process code that cannot be Mocked
-                return new HttpResponseMessage(HttpStatusCode.NotFound);
-            })));
-
-            var unitUnderTest = CreateService();
-
-            mockSecureStorageService.Setup(x => x.GetValue<string>("ExposureInformation", default)).Returns("[{\"Timestamp\":\"2020-12-21T10:00:00\",\"Duration\":\"00:05:00.000\",\"AttenuationValue\":2,\"TotalRiskScore\":19,\"TransmissionRiskLevel\":4},{\"Timestamp\":\"2020-12-21T11:00:00\",\"Duration\":\"00:15:00.000\",\"AttenuationValue\":3,\"TotalRiskScore\":20,\"TransmissionRiskLevel\":5}]");
-
-            var result = unitUnderTest.GetExposureCount();
-
-            Assert.Equal(2, result);
-        }
-
-        [Fact]
-        public void GetExposureCountTests_NoData()
-        {
-            mockHttpClientService.Setup(x => x.Create()).Returns(new HttpClient(new MockHttpHandler((request, cancellationToken) =>
-            {
-                // Make an error not to process code that cannot be Mocked
-                return new HttpResponseMessage(HttpStatusCode.NotFound);
-            })));
-
-            var unitUnderTest = CreateService();
-
-            mockSecureStorageService.Setup(x => x.GetValue<string>("ExposureInformation", default)).Returns((string)(object)null);
-
-            var result = unitUnderTest.GetExposureCount();
-
-            Assert.Equal(0, result);
-        }
-
         [Fact]
         public void SetExposureInformationTests_Success()
         {
@@ -279,5 +247,122 @@ public void RemoveExposureInformationTests()
             mockLoggerService.Verify(x => x.StartMethod("RemoveExposureInformation", It.IsAny<string>(), It.IsAny<int>()), Times.Once());
             mockLoggerService.Verify(x => x.EndMethod("RemoveExposureInformation", It.IsAny<string>(), It.IsAny<int>()), Times.Once());
         }
+
+        [Theory]
+        [InlineData(15, 4, 1)]
+        [InlineData(16, 4, 1)]
+        [InlineData(17, 3, 2)]
+        [InlineData(18, 2, 3)]
+        [InlineData(19, 1, 4)]
+        [InlineData(20, 0, 0)]
+        public void GetExposureInformationListToDisplayTests_Success(int day, int expectedCount, int expectedStartDay)
+        {
+            mockHttpClientService.Setup(x => x.Create()).Returns(new HttpClient(new MockHttpHandler((request, cancellationToken) =>
+            {
+                // Make an error not to process code that cannot be Mocked
+                return new HttpResponseMessage(HttpStatusCode.NotFound);
+            })));
+
+            var unitUnderTest = CreateService();
+
+            mockSecureStorageService.Setup(x => x.GetValue<string>("ExposureInformation", default)).Returns("[{\"Timestamp\":\"2021-01-01T00:00:00\",\"Duration\":\"00:05:00.000\",\"AttenuationValue\":3,\"TotalRiskScore\":21,\"TransmissionRiskLevel\":4},{\"Timestamp\":\"2021-01-02T00:00:00\",\"Duration\":\"00:05:00.000\",\"AttenuationValue\":3,\"TotalRiskScore\":21,\"TransmissionRiskLevel\":4},{\"Timestamp\":\"2021-01-03T00:00:00\",\"Duration\":\"00:05:00.000\",\"AttenuationValue\":3,\"TotalRiskScore\":21,\"TransmissionRiskLevel\":4},{\"Timestamp\":\"2021-01-04T00:00:00\",\"Duration\":\"00:05:00.000\",\"AttenuationValue\":3,\"TotalRiskScore\":21,\"TransmissionRiskLevel\":4}]");
+            mockDateTimeUtility.Setup(x => x.UtcNow).Returns(new DateTime(2021, 1, day, 0, 0, 0));
+
+            var result = unitUnderTest.GetExposureInformationListToDisplay();
+
+            Assert.Equal(expectedCount, result.Count);
+            for (int idx = 0; idx < expectedCount; idx++)
+            {
+                Assert.Equal(new DateTime(2021, 1, expectedStartDay + idx, 0, 0, 0), result[idx].Timestamp);
+            }
+        }
+
+        [Fact]
+        public void GetExposureInformationListToDisplayTests_NoData()
+        {
+            mockHttpClientService.Setup(x => x.Create()).Returns(new HttpClient(new MockHttpHandler((request, cancellationToken) =>
+            {
+                // Make an error not to process code that cannot be Mocked
+                return new HttpResponseMessage(HttpStatusCode.NotFound);
+            })));
+
+            var unitUnderTest = CreateService();
+
+            mockSecureStorageService.Setup(x => x.GetValue<string>("ExposureInformation", default)).Returns((string)(object)null);
+            mockDateTimeUtility.Setup(x => x.UtcNow).Returns(new DateTime(2021, 1, 1, 0, 0, 0));
+
+            var result = unitUnderTest.GetExposureInformationListToDisplay();
+
+            Assert.Null(result);
+        }
+
+        [Theory]
+        [InlineData(17, 9, 0, 3, 2)]
+        [InlineData(17, 9, 1, 2, 3)]
+        public void GetExposureInformationListToDisplayTests_Jst(int day, int hour, int minute, int expectedCount, int expectedStartDay)
+        {
+            mockHttpClientService.Setup(x => x.Create()).Returns(new HttpClient(new MockHttpHandler((request, cancellationToken) =>
+            {
+                // Make an error not to process code that cannot be Mocked
+                return new HttpResponseMessage(HttpStatusCode.NotFound);
+            })));
+
+            var unitUnderTest = CreateService();
+
+            mockSecureStorageService.Setup(x => x.GetValue<string>("ExposureInformation", default)).Returns("[{\"Timestamp\":\"2021-01-01T00:00:00\",\"Duration\":\"00:05:00.000\",\"AttenuationValue\":3,\"TotalRiskScore\":21,\"TransmissionRiskLevel\":4},{\"Timestamp\":\"2021-01-02T00:00:00\",\"Duration\":\"00:05:00.000\",\"AttenuationValue\":3,\"TotalRiskScore\":21,\"TransmissionRiskLevel\":4},{\"Timestamp\":\"2021-01-03T00:00:00\",\"Duration\":\"00:05:00.000\",\"AttenuationValue\":3,\"TotalRiskScore\":21,\"TransmissionRiskLevel\":4},{\"Timestamp\":\"2021-01-04T00:00:00\",\"Duration\":\"00:05:00.000\",\"AttenuationValue\":3,\"TotalRiskScore\":21,\"TransmissionRiskLevel\":4}]");
+            mockDateTimeUtility.Setup(x => x.UtcNow).Returns(new DateTime(2021, 1, day, hour, minute, 0).AddHours(-9));
+
+            var result = unitUnderTest.GetExposureInformationListToDisplay();
+
+            Assert.Equal(expectedCount, result.Count);
+            for (int idx = 0; idx < expectedCount; idx++)
+            {
+                Assert.Equal(new DateTime(2021, 1, expectedStartDay + idx, 0, 0, 0), result[idx].Timestamp);
+            }
+        }
+
+        [Theory]
+        [InlineData(15, 4)]
+        [InlineData(16, 4)]
+        [InlineData(17, 3)]
+        [InlineData(18, 2)]
+        [InlineData(19, 1)]
+        [InlineData(20, 0)]
+        public void GetExposureCountToDisplayTests_Success(int day, int expectedCount)
+        {
+            mockHttpClientService.Setup(x => x.Create()).Returns(new HttpClient(new MockHttpHandler((request, cancellationToken) =>
+            {
+                // Make an error not to process code that cannot be Mocked
+                return new HttpResponseMessage(HttpStatusCode.NotFound);
+            })));
+
+            var unitUnderTest = CreateService();
+
+            mockSecureStorageService.Setup(x => x.GetValue<string>("ExposureInformation", default)).Returns("[{\"Timestamp\":\"2021-01-01T00:00:00\",\"Duration\":\"00:05:00.000\",\"AttenuationValue\":3,\"TotalRiskScore\":21,\"TransmissionRiskLevel\":4},{\"Timestamp\":\"2021-01-02T00:00:00\",\"Duration\":\"00:05:00.000\",\"AttenuationValue\":3,\"TotalRiskScore\":21,\"TransmissionRiskLevel\":4},{\"Timestamp\":\"2021-01-03T00:00:00\",\"Duration\":\"00:05:00.000\",\"AttenuationValue\":3,\"TotalRiskScore\":21,\"TransmissionRiskLevel\":4},{\"Timestamp\":\"2021-01-04T00:00:00\",\"Duration\":\"00:05:00.000\",\"AttenuationValue\":3,\"TotalRiskScore\":21,\"TransmissionRiskLevel\":4}]");
+            mockDateTimeUtility.Setup(x => x.UtcNow).Returns(new DateTime(2021, 1, day, 0, 0, 0));
+
+            var result = unitUnderTest.GetExposureCountToDisplay();
+
+            Assert.Equal(expectedCount, result);
+        }
+
+        [Fact]
+        public void GetExposureCountToDisplayTests_NoData()
+        {
+            mockHttpClientService.Setup(x => x.Create()).Returns(new HttpClient(new MockHttpHandler((request, cancellationToken) =>
+            {
+                // Make an error not to process code that cannot be Mocked
+                return new HttpResponseMessage(HttpStatusCode.NotFound);
+            })));
+
+            var unitUnderTest = CreateService();
+
+            mockSecureStorageService.Setup(x => x.GetValue<string>("ExposureInformation", default)).Returns((string)(object)null);
+            mockDateTimeUtility.Setup(x => x.UtcNow).Returns(new DateTime(2021, 1, 1, 0, 0, 0));
+
+            var result = unitUnderTest.GetExposureCountToDisplay();
+
+            Assert.Equal(0, result);
+        }
     }
 }
diff --git a/Covid19Radar/Xamarin.ExposureNotification/Xamarin.ExposureNotification.csproj b/Covid19Radar/Xamarin.ExposureNotification/Xamarin.ExposureNotification.csproj
index 1a701c1f3..daaedca7b 100644
--- a/Covid19Radar/Xamarin.ExposureNotification/Xamarin.ExposureNotification.csproj
+++ b/Covid19Radar/Xamarin.ExposureNotification/Xamarin.ExposureNotification.csproj
@@ -45,7 +45,7 @@
 
 		<PackageReference Include="Xamarin.GooglePlayServices.Basement" Version="117.2.1-preview01" />
 		<PackageReference Include="Xamarin.GooglePlayServices.Tasks" Version="117.0.2-preview01" />
-		<PackageReference Include="Xamarin.GooglePlayServices.Nearby.ExposureNotification" Version="18.0.2-eap.6" />
+		<PackageReference Include="Xamarin.GooglePlayServices.Nearby.ExposureNotification" Version="19.7.1-eap.1" />
 		<PackageReference Include="Xamarin.AndroidX.Core" Version="1.2.0" />
 		<PackageReference Include="Xamarin.AndroidX.Work.Runtime" Version="2.3.4.1" />
 	</ItemGroup>
diff --git a/src/Covid19Radar.Api/Covid19Radar.Api.csproj b/src/Covid19Radar.Api/Covid19Radar.Api.csproj
index 035e106f7..06807d46f 100644
--- a/src/Covid19Radar.Api/Covid19Radar.Api.csproj
+++ b/src/Covid19Radar.Api/Covid19Radar.Api.csproj
@@ -32,7 +32,7 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\ServiceDependencies\" />
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ProjectExtensions><VisualStudio><UserProperties host_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/src/Covid19Radar.Api/Services/DeviceValidationAndroidService.cs b/src/Covid19Radar.Api/Services/DeviceValidationAndroidService.cs
index 6e7ea1a1b..829f11748 100644
--- a/src/Covid19Radar.Api/Services/DeviceValidationAndroidService.cs
+++ b/src/Covid19Radar.Api/Services/DeviceValidationAndroidService.cs
@@ -23,17 +23,6 @@ namespace Covid19Radar.Api.Services
 {
     public class DeviceValidationAndroidService
     {
-        const string UrlAndroid = "https://www.googleapis.com/androidcheck/v1/attestations/verify?key=";
-        private readonly HttpClient ClientAndroid;
-        private readonly string AndroidSecret;
-
-        public DeviceValidationAndroidService(
-            IConfiguration config,
-            IHttpClientFactory client)
-        {
-            ClientAndroid = client.CreateClient();
-            AndroidSecret = config.AndroidSafetyNetSecret();
-        }
 
         /// <summary>
         /// for Android
@@ -54,9 +43,9 @@ public class AndroidResponse
         /// </summary>
         /// <param name="param">subumission parameter</param>
         /// <returns>True when successful.</returns>
-        public async Task<bool> Validation(DiagnosisSubmissionParameter param, byte[] expectedNonce, DateTimeOffset requestTime, AuthorizedAppInformation app)
+        public  bool Validation(DiagnosisSubmissionParameter param, byte[] expectedNonce, DateTimeOffset requestTime, AuthorizedAppInformation app)
         {
-            var claims = await ParsePayloadAsync(param.DeviceVerificationPayload);
+            var claims = ParsePayload(param.DeviceVerificationPayload);
 
             // Validate the nonce
             if (Convert.ToBase64String(claims.Nonce) != Convert.ToBase64String(expectedNonce))
@@ -100,7 +89,7 @@ public async Task<bool> Validation(DiagnosisSubmissionParameter param, byte[] ex
             return true;
         }
 
-        public async Task<AndroidAttestationStatement> ParsePayloadAsync(string signedAttestationStatement)
+        private AndroidAttestationStatement ParsePayload(string signedAttestationStatement)
         {
             // First parse the token and get the embedded keys.
             JwtSecurityToken token;
@@ -113,15 +102,6 @@ public async Task<AndroidAttestationStatement> ParsePayloadAsync(string signedAt
                 // The token is not in a valid JWS format.
                 return null;
             }
-            try
-            {
-                var response = await VerifyAsync(signedAttestationStatement);
-                if (!response.IsValidSignature) return null;
-            }
-            catch (Exception)
-            {
-                return null;
-            }
 
             // We just want to validate the authenticity of the certificate.
             var validationParameters = new TokenValidationParameters
@@ -158,17 +138,6 @@ public async Task<AndroidAttestationStatement> ParsePayloadAsync(string signedAt
             return new AndroidAttestationStatement(claimsDictionary);
         }
 
-        private async Task<AndroidResponse> VerifyAsync(string signedAttestationStatement)
-        {
-            var payload = new AndroidPayload()
-            {
-                SignedAttestation = signedAttestationStatement
-            };
-            var payloadJson = JsonConvert.SerializeObject(payload);
-            var response = await ClientAndroid.PostAsync($"{UrlAndroid}{AndroidSecret}", new StringContent(payloadJson, Encoding.UTF8, "application/json"));
-
-            return JsonConvert.DeserializeObject<AndroidResponse>(await response.Content.ReadAsStringAsync());
-        }
 
         static string GetHostName(X509SecurityKey securityKey)
         {
diff --git a/src/Covid19Radar.Api/Services/DeviceValidationService.cs b/src/Covid19Radar.Api/Services/DeviceValidationService.cs
index 557c58596..53c7fd449 100644
--- a/src/Covid19Radar.Api/Services/DeviceValidationService.cs
+++ b/src/Covid19Radar.Api/Services/DeviceValidationService.cs
@@ -25,7 +25,7 @@ public DeviceValidationService(
             IAuthorizedAppRepository authApp,
             ILogger<DeviceValidationService> logger)
         {
-            Android = new DeviceValidationAndroidService(config, http);
+            Android = new DeviceValidationAndroidService();
             Apple = new DeviceValidationAppleService(config, http, logger);
             AuthApp = authApp;
         }
@@ -40,7 +40,7 @@ public async Task<bool> Validation(DiagnosisSubmissionParameter param, DateTimeO
             if (!app.DeviceValidationEnabled) return true;
             return param.Platform switch
             {
-                "android" => await Android.Validation(param, param.GetAndroidNonce(), requestTime, app),
+                "android" => Android.Validation(param, param.GetAndroidNonce(), requestTime, app),
                 "ios" => await Apple.Validation(param, requestTime, app),
                 _ => false,
             };
diff --git a/src/Covid19Radar.Api/Services/V1DeviceValidationService.cs/V1DeviceValidationService.cs b/src/Covid19Radar.Api/Services/V1DeviceValidationService.cs
similarity index 90%
rename from src/Covid19Radar.Api/Services/V1DeviceValidationService.cs/V1DeviceValidationService.cs
rename to src/Covid19Radar.Api/Services/V1DeviceValidationService.cs
index 1dfba1883..83605fd77 100644
--- a/src/Covid19Radar.Api/Services/V1DeviceValidationService.cs/V1DeviceValidationService.cs
+++ b/src/Covid19Radar.Api/Services/V1DeviceValidationService.cs
@@ -27,7 +27,7 @@ public V1DeviceValidationService(
             IAuthorizedAppRepository authApp,
             ILogger<V1DeviceValidationService> logger)
         {
-            Android = new DeviceValidationAndroidService(config, http);
+            Android = new DeviceValidationAndroidService();
             Apple = new DeviceValidationAppleService(config, http, logger);
             AuthApp = authApp;
         }
@@ -40,7 +40,7 @@ public async Task<bool> Validation(V1DiagnosisSubmissionParameter param, DateTim
             if (!app.DeviceValidationEnabled) return true;
             return param.Platform switch
             {
-                "android" => await Android.Validation(param, param.GetAndroidNonce(), requestTime, app),
+                "android" =>  Android.Validation(param, param.GetAndroidNonce(), requestTime, app),
                 "ios" => await Apple.Validation(param, requestTime, app),
                 _ => false,
             };