Merge "Log overflow bubble restoration after phone reboot" into sc-dev