Merge "Follow-up Idae8d920 (8c65834): no need to call getContext() and escape the...