Merge "Fix layering and launching issues."