Merge "atest support for app startup test"