Merge "Add wait time after broadcasting <Active Source> from adapter" into android12-tests-dev