Merge "Don't try to show crash dialog if lock screen is showing." into nyc-mr1-dev