Change the layout to align view components with TwoTargetPreference. Fixes: 124084391 Test: Visual Change-Id: I417a8e442bd80c51be04e3f33514a6605c9b45f8