Merge "Initialize intent to avoid nullpointer exception"