Merge "Fix and improve switching applications"