Merge "Make ActivityContextInfo.CONTEXT_FLAGS a method instead of a constant" into main