Single PR for both as followed approved content on Android. Upon your suggestion I'm going to split that now.