Merge "Fix live timer activity launches" into main