Merge proposals dependent on lp://staging/~waynerutter/droidpad-android/trunk

lp://staging/~waynerutter/droidpad-android/trunk has no merge proposals.