Merge commit 'beb3214b46e18bb461760c47f04c5b909557d060' * commit 'beb3214b46e18bb461760c47f04c5b909557d060': ADT #1823896: Ability to add an "extra" action to the AVD Selector.
Merge commit 'beb3214b46e18bb461760c47f04c5b909557d060' * commit 'beb3214b46e18bb461760c47f04c5b909557d060': ADT #1823896: Ability to add an "extra" action to the AVD Selector.