Merge "Merge "Remove duplicate screenshot view from xml" into rvc-dev am: e5fe32ec am: 2a037b7e am: ac1929a3" into rvc-qpr-dev-plus-aosp