Merge "Apply new metrics to make App info dialogs have their own unique id"