Merge "Remove unnecessary method from StatefulActivity" into udc-qpr-dev