Merge "support for AutoPlay apps"