Merge "Fix WCT.setBounds not being picked up by Task" into tm-dev