Integrate with BetaPreferences

Look at logo Michael.

Bug: 52686
Change-Id: I3cfada2ea264184698de5f322c1fe5041b37b8c8
Merge "Integrate with BetaPreferences"