Merge "Add a suspension check to SuspendedAppActivity" into main