Merge "Update the last active time to be in-sync with recency when device restarts" into main