Merge "Fix to NullPointerException on move back in ActivityStack."