Merge proposals dependent on lp://staging/~noahy/tomdroid/main

lp://staging/~noahy/tomdroid/main has no merge proposals.