Merge "Finish attach appliation before creating app context"