Merge "API Review: Drop "Button" in is/setLogoutEnabled method"