Merge "Fix system crash by debug parameters of activity launch"