Track aokp theme chooser and upstream ppp