Merge "Reland "customtabs: Add "extraCommand" and "extraCallback", for unsupported commands"" into mnc-dev