Merge "Tabbed navigation in Wallpaper Picker (2/3)." into tm-qpr-dev