Merge "Fix "blink" when going "back" quickly after entering Activity."