Merge "Do not override finish activity behavior on back event" into udc-dev