Merge "Use ActivityStarter to start Settings activity" into tm-qpr-dev