Merge "Nuanced Uri handling related to WM/AM locking." into rvc-dev