Merge "Move intent action to xml"