Merge "Only add boolean extra to bundle when the value is false" into tm-dev