Merge proposals dependent on lp://staging/~tomdroid-dev/tomdroid/new_ui

lp://staging/~tomdroid-dev/tomdroid/new_ui has no merge proposals.