Merge "Unblock screen-on after start transaction is completed" into 24D1-dev