Merge "Force restart button creation after full rotation" into tm-qpr-dev