Merge "Remove simulator from the lunch menu"