Merge "Fix the issue that App crash on startForeground" into nyc-dev