Merge "Minor cleanups and fixes for ActionIntentCreator" into udc-qpr-dev