Merge "Enable close app (with back or home) tests"