Merge "Turn on the Aware suspension as default" into udc-dev