[SM07] Make combine subtype configurable from Settings am: 1be2d732e0

Change-Id: Ic8426ae36b5aaadfdd3292a3b70fc9b290443d5c