Merge "Reset app freezer timeout for broadcast messages" into sc-v2-dev