Merge proposals dependent on lp://qastaging/~phablet-team/network-manager/vivid-phone-overlay

1. vivid-phone-overlay
2. Dependent merge proposals