Merge "Remove settings intent"