Merge "Remove flags for wallet and alarm" into sc-dev