Merge "Fix managed device disclosure on "Add account" screen" into sc-v2-dev