Merge "Use the context user when checking for apps subject to suspension." into main