Merge "Don't try to show crash dialog if lock screen is showing." into nyc-mr1-dev am: cb443c52 am: 8298dae9 am: 38ca6da8 Change-Id: I42796344ac0811202760e482e4d6c795477208ea