Merge "Add watch specific tweaks to global actions layouts." into pi-dev