Merge "Handle user consent denial sooner"