Merge "Show terms of service before install GSI/DSU"