Merge \\"Reset relaunching count is app dies during re-launch\\" into nyc-mr1-dev am: 45f8aaca7c
am: b89cd36085

Change-Id: Ie22a2fafb6991761ac42cef1e513d7e8ff03a565